mergetools / gvimdiff2on commit cherry-pick/revert: add --skip option (de81ca3)
   1. "$MERGE_TOOLS_DIR/vimdiff"