Merge branch 'mt/patch-id-stable' (early part) into next
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"