diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink index 43f45f2..83d8705 100644 --- a/git/gitconfig.symlink +++ b/git/gitconfig.symlink @@ -2,7 +2,7 @@ excludesfile = /Users/marcusbengtsson/.gitignore_global [difftool "sourcetree"] cmd = /usr/local/Cellar/kdiff3/0.9.98/kdiff3.app/Contents/MacOS/kdiff3 \"$LOCAL\" \"$REMOTE\" - path = + path = [mergetool "sourcetree"] cmd = /usr/local/Cellar/kdiff3/0.9.98/kdiff3.app/Contents/MacOS/kdiff3 \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\" trustExitCode = true diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink index 43f45f2..83d8705 100644 --- a/git/gitconfig.symlink +++ b/git/gitconfig.symlink @@ -2,7 +2,7 @@ excludesfile = /Users/marcusbengtsson/.gitignore_global [difftool "sourcetree"] cmd = /usr/local/Cellar/kdiff3/0.9.98/kdiff3.app/Contents/MacOS/kdiff3 \"$LOCAL\" \"$REMOTE\" - path = + path = [mergetool "sourcetree"] cmd = /usr/local/Cellar/kdiff3/0.9.98/kdiff3.app/Contents/MacOS/kdiff3 \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\" trustExitCode = true diff --git a/vim/vim.symlink/plugins.vim b/vim/vim.symlink/plugins.vim index a2aca5f..61df388 100644 --- a/vim/vim.symlink/plugins.vim +++ b/vim/vim.symlink/plugins.vim @@ -65,6 +65,9 @@ " VIM-XPATH https://github.com/actionshrimp/vim-xpath Plugin 'actionshrimp/vim-xpath' +" VIM-SCALA https://github.com/derekwyatt/vim-scala +Plugin 'derekwyatt/vim-scala' + " All of your Plugins must be added before the following line call vundle#end() " required filetype plugin indent on " required diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink index 43f45f2..83d8705 100644 --- a/git/gitconfig.symlink +++ b/git/gitconfig.symlink @@ -2,7 +2,7 @@ excludesfile = /Users/marcusbengtsson/.gitignore_global [difftool "sourcetree"] cmd = /usr/local/Cellar/kdiff3/0.9.98/kdiff3.app/Contents/MacOS/kdiff3 \"$LOCAL\" \"$REMOTE\" - path = + path = [mergetool "sourcetree"] cmd = /usr/local/Cellar/kdiff3/0.9.98/kdiff3.app/Contents/MacOS/kdiff3 \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\" trustExitCode = true diff --git a/vim/vim.symlink/plugins.vim b/vim/vim.symlink/plugins.vim index a2aca5f..61df388 100644 --- a/vim/vim.symlink/plugins.vim +++ b/vim/vim.symlink/plugins.vim @@ -65,6 +65,9 @@ " VIM-XPATH https://github.com/actionshrimp/vim-xpath Plugin 'actionshrimp/vim-xpath' +" VIM-SCALA https://github.com/derekwyatt/vim-scala +Plugin 'derekwyatt/vim-scala' + " All of your Plugins must be added before the following line call vundle#end() " required filetype plugin indent on " required diff --git a/vim/vim.symlink/vim.symlink b/vim/vim.symlink/vim.symlink deleted file mode 120000 index 600c40d..0000000 --- a/vim/vim.symlink/vim.symlink +++ /dev/null @@ -1 +0,0 @@ -/Users/marcusbengtsson/.dotfiles/vim/vim.symlink \ No newline at end of file