Andrew's git
/
gitweb.git
/ mergetools/vimdiff2
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
mergetools
/
vimdiff2
on commit
merge-strategies: avoid implying that "-s theirs" exists (c25d98b)
history
|
raw
|
HEAD
1
. "$MERGE_TOOLS_DIR/vimdiff"