Andrew's git / gitweb.git / diff
?
Merge branch 'rr/doc-merge-strategies'
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Mar 2014 18:08:23 +0000 (11:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Mar 2014 18:08:23 +0000 (11:08 -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