mergetools / gvimdiff3on commit Merge branch 'bw/pathspec-cleanup' (fe9ec8b)
   1. "$MERGE_TOOLS_DIR/vimdiff"