##// END OF EJS Templates
merge.applyupdates: don't return early if merge driver's conclude failed...
merge.applyupdates: don't return early if merge driver's conclude failed Somewhat silly oversight -- this prevented the progress bar from being reset.

File last commit:

r24907:9570587b default
r26975:6618dfd3 default
Show More
map-cmdline.phases
3 lines | 248 B | text/plain | TextLexer
%include map-cmdline.default
changeset = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{user}{ldate}{summary}\n'
changeset_verbose = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{user}{ldate}{lfiles}{lfile_copies_switch}{description}\n'