mergetools / gvimdiff2on commit rerere: split conflict ID further (1869bbe)
   1. "$MERGE_TOOLS_DIR/vimdiff"