mergetools / gvimdiffon commit Merge branch 'bw/pathspec-sans-the-index' (3c5a782)
   1. "$MERGE_TOOLS_DIR/vimdiff"