##// END OF EJS Templates
merge: introduce method to minimize merge regions...
merge: introduce method to minimize merge regions In the next diff, we will use this to trim down the start and end of conflict regions where the A and B sides both made the same changes.

File last commit:

r24907:9570587b default
r28071:261324dd 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'