Merge branch 'rh/merge-options-doc-fix' into maint
* rh/merge-options-doc-fix: Documentation/merge-options.txt: restore `-e` option
Junio C Hamano committed
Jul 3, 2013 at 15:36 UTC
15afe9596c101d00085830c54fdc4c4ad0b7193e
No changes.