mergetools / gvimdiff2on commit Merge branch 'jk/diff-filespec-cleanup' (9b34767)
   1. "$MERGE_TOOLS_DIR/vimdiff"