]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a13d137) | patch
t4200: rerere a merge with two identical conflicts
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 21:58:25 +0000 (14:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2016 22:32:19 +0000 (15:32 -0700)
commit82efa6e27e76ecd0f52a93886bcee1b8e517a662
tree6ad93aedc8978179b5b8d4b83d56266611f223cdtree | snapshot
parenta13d13700b05442855447670d7c3313f99f5da3ccommit | diff
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>
t/t4200-rerere.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.