diff options
| author | Florian Pritz <bluewind@xinu.at> | 2015-05-14 18:04:32 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2015-05-14 18:04:32 +0200 |
| commit | 72ba15a3939fa1840f3ef901d56cfc6ccb5fd20b (patch) | |
| tree | d21ef5811364e855fce51140fc397650bd2b6792 | |
| parent | 20bebb79ed8ced8f827f91e83c4fe22ad66d86c4 (diff) | |
| download | dotfiles-72ba15a3939fa1840f3ef901d56cfc6ccb5fd20b.tar.gz dotfiles-72ba15a3939fa1840f3ef901d56cfc6ccb5fd20b.tar.xz | |
git: add vim mergetool
Signed-off-by: Florian Pritz <bluewind@xinu.at>
| -rw-r--r-- | .gitconfig | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -36,6 +36,8 @@ #cccmd = git-cc [mergetool "cp"] cmd = cp \"$REMOTE\" \"$MERGED\" +[mergetool "vim"] + cmd = vim -f \"$MERGED\" [mergetool "vimdiff3"] cmd = vim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" [core] |