Mercurial > public > mercurial-scm > hg
log mercurial/filemerge.py @ 48981:f3aafd785e65
age | author | description |
---|---|---|
Tue, 18 Jan 2022 13:05:21 -0800 | Martin von Zweigbergk | filemerge: add support for partial conflict resolution by external tool |
Thu, 17 Mar 2022 12:27:40 +0100 | Rapha?l Gom?s | branching: merge stable into default |