comparison tests/test-censor.t @ 26975:6618dfd3ea1c

merge.applyupdates: don't return early if merge driver's conclude failed Somewhat silly oversight -- this prevented the progress bar from being reset.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 15 Nov 2015 22:45:20 -0800
parents 5e18f6e39006
children 75be14993fda
comparison
equal deleted inserted replaced
26974:4b5dc0d9e899 26975:6618dfd3ea1c