Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Documentation/merge-options.txt: restore
-e
option
It looks like commit f824628 unintentionally removed the documentation for the `-e` option. Signed-off-by: Richard Hansen <rhansen@bbn.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
- Loading branch information