Mercurial > hg
diff tests/test-diff-ignore-whitespace.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 | 405b6bd015df |
children | da07367d683b |