Merge branch 'jk/a-thread-only-dies-once' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"