mergetools / gvimdiffon commit Merge branch 'va/i18n' of ../git-gui into va/git-gui-i18n (0219a05)
   1. "$MERGE_TOOLS_DIR/vimdiff"