Files
git/Documentation
Richard Hansen 66fa1b2c35 Documentation/merge-options.txt: restore -e option
It looks like commit f8246281af
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>
2013-05-16 16:40:00 -07:00
..
2013-05-09 13:31:17 -07:00
2012-04-20 15:49:16 -07:00
2013-02-14 10:29:01 -08:00
2012-06-19 11:35:19 -07:00
2013-04-12 12:00:52 -07:00
2013-02-05 16:13:32 -08:00
2011-09-06 11:42:12 -07:00
2013-04-12 12:00:52 -07:00
2011-03-11 10:59:16 -05:00
2013-02-27 10:10:28 -08:00
2013-04-12 12:00:52 -07:00
2013-04-12 12:00:52 -07:00
2013-05-09 13:31:17 -07:00
2013-02-07 14:42:16 -08:00
2013-02-07 14:41:45 -08:00