Status	Author	Revision
Closed	martinvonz	D11999 merge: consider the file merged when using :merge-{local,other}
Closed	martinvonz	D11998 simplemerge: delete unused exception class `CantReprocessAndShowBase`
Closed	martinvonz	D11981 simplemerge: change _minimize() to minimize a single conflict
Closed	martinvonz	D11980 simplemerge: make minimize() a free function
Closed	martinvonz	D11979 simplemerge: simplify and rename `render_markers()`
Closed	martinvonz	D11978 simplemerge: split out function for rendering :merge3 conflict markers
Closed	martinvonz	D11977 simplemerge: move default labels to simplemerge extension
Closed	martinvonz	D11976 simplemerge: use same newline detection for :mergediff as for :merge[3]
Closed	martinvonz	D11975 simplemerge: clarify names of functions that render conflict markers
Closed	martinvonz	D11974 simplemerge: make merge_lines() a free function
Closed	martinvonz	D11973 simplemerge: convert `merge_lines()` away from generator
Closed	martinvonz	D11972 simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels

Diff 31634

mercurial/debugcommands.py