mergetools / gvimdiff2on commit Merge branch 'vv/merge-squash-with-explicit-commit' (6e0b1c6)
   1. "$MERGE_TOOLS_DIR/vimdiff"