Andrew's git / gitweb.git / diff
?
Merge branch 'bc/doc-merge-no-op-revert'
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Dec 2013 19:47:00 +0000 (11:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Dec 2013 19:47:01 +0000 (11:47 -0800)
* bc/doc-merge-no-op-revert:
Documentation: document pitfalls with 3-way merge

Trivial merge