rerere: record resolution even if file is not in merge base
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Mon, 9 Jul 2007 13:47:24 +0000 (14:47 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Jul 2007 06:39:59 +0000 (23:39 -0700)
commit52aaf64...cb70134090c3e3a762bed730d5451c17
tree78ce43c...dcba2ec9790fcb968d697eb533e97840copy hash to clipboard (tree)
parentf39a946...1fb0fa4856cd0027b9da3603a1b06fdccopy hash to clipboard (diff)
builtin-rerere.c
t/t4200-rerere.sh