mergetools / gvimdiffon commit add -p: adjust offsets of subsequent hunks when one is skipped (fecc6f3)
   1. "$MERGE_TOOLS_DIR/vimdiff"