Andrew's git
/
gitweb.git
/ mergetools/gvimdiff3
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
mergetools
/
gvimdiff3
on commit
merge-recursive: check for file level conflicts then get new name (f6f7755)
history
|
raw
|
HEAD
1
. "$MERGE_TOOLS_DIR/vimdiff"