@matheusbsbs / matheus-bagliano / commits / 0067272999

Merge branch 'bc/doc-merge-no-op-revert'

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

Junio C Hamano committed Dec 17, 2013 at 11:47 UTC 0067272999bcf3ac3929a77114ec0e095910e03d

No changes.