Merge branch 'kb/full-history-compute-treesame-carefully-2'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"