pull: allow pull to preserve merges when rebasing
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"