| commit | d88949d86eddb62acbc85c16c97587db043d05b1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Sep 2018 20:53:56 +0000 (17 13:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Sep 2018 20:53:57 +0000 (17 13:53 -0700) | ||
| tree | da1257a2fbea26867cd6226c308cfd9004db81bb | treesnapshot (tar.gz zip) |
| parent | 881c019ea6a0a45f97fb8a1865a88b07263a02ca | commitdiff |
| parent | f427869bde759e32c30e8ba7a4b20837d3806642 | commitdiff |
Merge branch 'tg/rerere-doc-updates'
Clarify a part of technical documentation for rerere.
* tg/rerere-doc-updates:
rerere: add note about files with existing conflict markers
rerere: mention caveat about unmatched conflict markers
Clarify a part of technical documentation for rerere.
* tg/rerere-doc-updates:
rerere: add note about files with existing conflict markers
rerere: mention caveat about unmatched conflict markers