Mercurial > public > mercurial-scm > hg-stable
log mercurial/filemerge.py @ 48477:f45a4a47f6a8
age | author | description |
---|---|---|
Fri, 03 Dec 2021 22:45:35 -0800 | Martin von Zweigbergk | filemerge: inline `_filemerge()` into `filemerge()` |
Fri, 03 Dec 2021 21:41:43 -0800 | Martin von Zweigbergk | filemerge: make `_filemerge()` do both premerge and merge |