diff tests/test-1102.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 f2719b387380
children
line wrap: on
line diff