diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-17 11:47:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-17 11:47:01 -0800 |
| commit | 0067272999bcf3ac3929a77114ec0e095910e03d (patch) | |
| tree | 2d8d4a705c8d58c2e8d49c98658883253419ac49 /t/t4110/patch4.patch | |
| parent | 4d1826d1d96a4284ef268c6febeaa9fabfa75e9e (diff) | |
| parent | c5665000327388832fa8be0b3bf17669f672481b (diff) | |
| download | git-0067272999bcf3ac3929a77114ec0e095910e03d.tar.gz git-0067272999bcf3ac3929a77114ec0e095910e03d.tar.xz | |
Merge branch 'bc/doc-merge-no-op-revert'
* bc/doc-merge-no-op-revert:
Documentation: document pitfalls with 3-way merge
Diffstat (limited to 't/t4110/patch4.patch')
0 files changed, 0 insertions, 0 deletions