HomePhabricator

simplemerge: remove now-unused `localorother` argument from `merge_lines()`

Authored by martinvonz.