mergetools / gvimdiff2on commit Merge branch 'mk/doc-git-gui-display-untracked' (b809658)
   1. "$MERGE_TOOLS_DIR/vimdiff"