-
由 Phillip Wood 提交于
Save the rerere-autoupdate setting so that it is remembered after stopping for the user to resolve conflicts. Signed-off-by: NPhillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
fd4a3f48
Save the rerere-autoupdate setting so that it is remembered after stopping for the user to resolve conflicts. Signed-off-by: NPhillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: NJunio C Hamano <gitster@pobox.com>