diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-17 20:53:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 20:53:57 (GMT) |
| commit | d88949d86eddb62acbc85c16c97587db043d05b1 (patch) | |
| tree | da1257a2fbea26867cd6226c308cfd9004db81bb /builtin/log.c | |
| parent | 881c019ea6a0a45f97fb8a1865a88b07263a02ca (diff) | |
| parent | f427869bde759e32c30e8ba7a4b20837d3806642 (diff) | |
| download | git-d88949d86eddb62acbc85c16c97587db043d05b1.zip git-d88949d86eddb62acbc85c16c97587db043d05b1.tar.gz git-d88949d86eddb62acbc85c16c97587db043d05b1.tar.bz2 | |
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/log.c')
0 files changed, 0 insertions, 0 deletions