mergetools / vimdiff3on commit Merge branch 'ls/git-gui-no-double-utf8-author-name' (e7d1b52)
   1. "$MERGE_TOOLS_DIR/vimdiff"