diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:57 -0700 |
| commit | d88949d86eddb62acbc85c16c97587db043d05b1 (patch) | |
| tree | da1257a2fbea26867cd6226c308cfd9004db81bb /builtin | |
| parent | Merge branch 'es/format-patch-rangediff' (diff) | |
| parent | rerere: add note about files with existing conflict markers (diff) | |
| download | tgif-d88949d86eddb62acbc85c16c97587db043d05b1.tar.xz | |
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
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions