Merge branch 'jc/sha1-name-object-peeler'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"