Mercurial > public > mercurial-scm > hg
log mercurial/filemerge.py @ 48555:c91418480cb0
age | author | description |
---|---|---|
Tue, 14 Dec 2021 13:12:56 -0800 | Martin von Zweigbergk | simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels |
age | author | description |
---|---|---|
Tue, 14 Dec 2021 13:12:56 -0800 | Martin von Zweigbergk | simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels |