mergetools / gvimdiff2on commit Merge branch 'kb/full-history-compute-treesame-carefully-2' (b27a79d)
   1. "$MERGE_TOOLS_DIR/vimdiff"