From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Jun 2015 21:58:25 +0000 (-0700)
Subject: t4200: rerere a merge with two identical conflicts
X-Git-Tag: v2.9.0-rc0~100^2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/82efa6e27e76ecd0f52a93886bcee1b8e517a662?ds=inline;hp=82efa6e27e76ecd0f52a93886bcee1b8e517a662

t4200: rerere a merge with two identical conflicts

When the context of multiple identical conflicts are different, two
seemingly the same conflict resolution cannot be safely applied.

In such a case, at least we should be able to record these two
resolutions separately in the rerere database, and reuse them when
we see the same conflict later.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---