From: Junio C Hamano Date: Mon, 17 Sep 2018 20:53:56 +0000 (-0700) Subject: Merge branch 'tg/rerere-doc-updates' X-Git-Tag: v2.20.0-rc0~238 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d88949d86eddb62acbc85c16c97587db043d05b1 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 --- d88949d86eddb62acbc85c16c97587db043d05b1