Merge branch 'jc/fsck-nul-in-commit'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"