Merge branch 'nl/reset-patch-takes-a-tree'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"