| commit | 0067272999bcf3ac3929a77114ec0e095910e03d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 Dec 2013 19:47:00 +0000 (17 11:47 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 Dec 2013 19:47:01 +0000 (17 11:47 -0800) | ||
| tree | 2d8d4a705c8d58c2e8d49c98658883253419ac49 | treesnapshot (tar.gz zip) |
| parent | 4d1826d1d96a4284ef268c6febeaa9fabfa75e9e | commitdiff |
| parent | c5665000327388832fa8be0b3bf17669f672481b | commitdiff |
Merge branch 'bc/doc-merge-no-op-revert'
* bc/doc-merge-no-op-revert:
Documentation: document pitfalls with 3-way merge
* bc/doc-merge-no-op-revert:
Documentation: document pitfalls with 3-way merge