log mercurial/merge.py @ 42098:5753e5949b51

age author description
Wed, 03 Apr 2019 11:21:27 -0700 Martin von Zweigbergk cleanup: use set literals where possible
Sat, 30 Mar 2019 13:13:10 -0700 Martin von Zweigbergk merge: make "labels" argument to graft() optional, like it is for update()
Wed, 20 Feb 2019 19:28:51 -0500 Augie Fackler cleanup: use () to wrap long lines instead of \
Mon, 04 Feb 2019 21:19:05 -0800 Martin von Zweigbergk merge: migrate to scmutil.backuppath()
Mon, 04 Feb 2019 21:23:44 -0800 Martin von Zweigbergk merge: don't unnecessarily calculate absolute path
Mon, 04 Feb 2019 21:21:55 -0800 Martin von Zweigbergk merge: don't unnecessarily calculate backup path
Thu, 17 Jan 2019 09:17:12 -0800 Martin von Zweigbergk cleanup: delete lots of unused local variables