Merge branch 'js/rerere-forget-protect-against-NUL'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"