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)
commit0067272999bcf3ac3929a77114ec0e095910e03d
tree2d8d4a705c8d58c2e8d49c98658883253419ac49
parent4d1826d1d96a4284ef268c6febeaa9fabfa75e9e
parentc5665000327388832fa8be0b3bf17669f672481b
Merge branch 'bc/doc-merge-no-op-revert'

* bc/doc-merge-no-op-revert:
  Documentation: document pitfalls with 3-way merge