reset: allow --keep with --stage
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"