Merge branch 'jc/rev-parse-argh-dashed-multi-words'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"