mergetools / vimdiff2on commit Merge branch 'ls/no-double-utf8-author-name' of ../git-gui into ls/git-gui-no-double-utf8-author-name (77e4224)
   1. "$MERGE_TOOLS_DIR/vimdiff"