From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Dec 2013 19:47:00 +0000 (-0800)
Subject: Merge branch 'bc/doc-merge-no-op-revert'
X-Git-Tag: v1.9-rc0~66
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0067272999bcf3ac3929a77114ec0e095910e03d?ds=inline;hp=--cc

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

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

0067272999bcf3ac3929a77114ec0e095910e03d