nes on different files. The options for remerge have the same meaning and defaults as the ones for merge. The difference is that remerge can (only) be run when there is a pending merge, and it lets you specify particular files. :Examples: Re-do the merge of all conflicted files, and show the base text in conflict regions, in addition to the usual THIS and OTHER texts:: brz remerge --show-base Re-do the merge of "foobar", using the weave merge algorithm, with additional processing to reduce the size of conflict regions:: brz remerge --merge-type weave --reprocess foobar r…