repo.or.cz
/
git
/
gitweb.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint
[git/gitweb.git]
/
mergetools
/
vimdiff2
blob
04a5bb0ea8484244e420ef13072773623c5b0366
1
. "$MERGE_TOOLS_DIR/vimdiff"
