diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-24 21:58:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-15 22:32:19 (GMT) |
| commit | 82efa6e27e76ecd0f52a93886bcee1b8e517a662 (patch) | |
| tree | 6ad93aedc8978179b5b8d4b83d56266611f223cd /t/t6008-rev-list-submodule.sh | |
| parent | a13d13700b05442855447670d7c3313f99f5da3c (diff) | |
| download | git-82efa6e27e76ecd0f52a93886bcee1b8e517a662.zip git-82efa6e27e76ecd0f52a93886bcee1b8e517a662.tar.gz git-82efa6e27e76ecd0f52a93886bcee1b8e517a662.tar.bz2 | |
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>
Diffstat (limited to 't/t6008-rev-list-submodule.sh')
0 files changed, 0 insertions, 0 deletions