mergetools / gvimdiff2on commit diff -B -M: fix output for "copy and then rewrite" case (6936b58)
   1. "$MERGE_TOOLS_DIR/vimdiff"