Merge branch 'nb/gnome-keyring-build' into maint
[git/gitweb.git] / mergetools / vimdiff2
blob04a5bb0ea8484244e420ef13072773623c5b0366
1 . "$MERGE_TOOLS_DIR/vimdiff"