Andrew's git / gitweb.git / diff
?
Merge branch 'rh/merge-options-doc-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:36:30 +0000 (15:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:36:30 +0000 (15:36 -0700)
* rh/merge-options-doc-fix:
Documentation/merge-options.txt: restore `-e` option

1  2 
Documentation/merge-options.txt patch | diff1 | diff2 | blob | history
diff --cc Documentation/merge-options.txt
Simple merge