mergetools / gvimdiff3on commit Merge branch 'jk/diff-compact-heuristic' (e5f7675)
   1. "$MERGE_TOOLS_DIR/vimdiff"