Mercurial > public > mercurial-scm > hg

log mercurial/filemerge.py @ 48982:9dfbea54b680

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -30 -10 -3 tip
age author description
Thu, 17 Mar 2022 11:19:06 -0700 Martin von Zweigbergk partial-merge: add support for `.args` config (`$local` etc.)
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
less more | (0) -300 -100 -30 -10 -3 tip