Merge branch 'rh/merge-options-doc-fix'
* rh/merge-options-doc-fix: Documentation/merge-options.txt: restore `-e` option
Junio C Hamano committed
Jun 2, 2013 at 15:48 UTC
499eaceb217df573fb3698d7a52e3e5a9b4173bc
No changes.