mergetools / gvimdiff3on commit diff-highlight: avoid highlighting combined diffs (3dbfe2b)
   1. "$MERGE_TOOLS_DIR/vimdiff"