From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Jul 2013 22:36:30 +0000 (-0700)
Subject: Merge branch 'rh/merge-options-doc-fix' into maint
X-Git-Tag: v1.8.3.3~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15afe9596c101d00085830c54fdc4c4ad0b7193e;p=thirdparty%2Fgit.git

Merge branch 'rh/merge-options-doc-fix' into maint

* rh/merge-options-doc-fix:
  Documentation/merge-options.txt: restore `-e` option
---

15afe9596c101d00085830c54fdc4c4ad0b7193e