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