mergetools / gvimdiff2on commit apply: use skip_prefix instead of raw addition (ce2ecf2)
   1. "$MERGE_TOOLS_DIR/vimdiff"