mergetools / gvimdiff2on commit Merge branch 'nd/git-common-dir-fix' into maint (9c17cca)
   1. "$MERGE_TOOLS_DIR/vimdiff"