Merge branch 'jk/pull-into-dirty-unborn'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"