pull: do nothing on --dry-run
[gitweb.git] / contrib / examples / git-merge-ours.sh
2007-11-22 git-merge-ours: make it a builtin.