mergetools / gvimdiff2on commit rerere: fix an off-by-one non-bug (fb70a06)
   1. "$MERGE_TOOLS_DIR/vimdiff"