Page MenuHomePhabricator

simplemerge: make merge_lines() a free function
ClosedPublic

Authored by martinvonz on Wed, Jan 12, 1:55 AM.

Details

Summary

IMO, the rendering of a conflict as text with merge markers should be
separate from the code for resolving conflicts. The latter is what
Merge3Text is mostly about already.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.