From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 2 Jun 2013 22:48:22 +0000 (-0700)
Subject: Merge branch 'rh/merge-options-doc-fix'
X-Git-Tag: v1.8.4-rc0~240
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=499eaceb217df573fb3698d7a52e3e5a9b4173bc;p=git

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

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

499eaceb217df573fb3698d7a52e3e5a9b4173bc