mergetools / gvimdiff3on commit am --skip/--abort: merge HEAD/ORIG_HEAD tree into index (3ecc704)
   1. "$MERGE_TOOLS_DIR/vimdiff"