mergetools / vimdiff2on commit subtree: improve decision on merges kept in split (68f8ff8)
   1. "$MERGE_TOOLS_DIR/vimdiff"