mergetools / gvimdiffon commit mergetools/diffmerge: support DiffMerge as a git mergetool (c5f424f)
   1. "$MERGE_TOOLS_DIR/vimdiff"