mergetools / gvimdiffon commit Merge branch 'jc/gitignore-precedence' (20cf8b5)
   1. "$MERGE_TOOLS_DIR/vimdiff"