mergetools / gvimdiffon commit cherry-pick/revert: advise using --skip (dcb500d)
   1. "$MERGE_TOOLS_DIR/vimdiff"