Andrew's git / gitweb.git / diff
?
Merge branch 'rr/doc-merge-strategies' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Apr 2014 20:39:03 +0000 (13:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Apr 2014 20:39:03 +0000 (13:39 -0700)
* rr/doc-merge-strategies:
Documentation/merge-strategies: avoid hyphenated commands

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