mergetools / gvimdiff3on commit Merge branch 'jc/retire-compaction-heuristics' (2ced5f2)
   1. "$MERGE_TOOLS_DIR/vimdiff"