am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"