mergetools / gvimdiffon commit Merge branch 'sy/i18n' of git-gui (02748bc)
   1. "$MERGE_TOOLS_DIR/vimdiff"