log mercurial/merge.py @ 37178:68ee61822182

age author description
Thu, 29 Mar 2018 21:29:15 -0700 Martin von Zweigbergk context: avoid using a context object as a changeid
Mon, 05 Mar 2018 00:30:00 -0500 Gregory Szorc merge: deprecate accessing update results by index
Mon, 05 Mar 2018 18:10:36 -0800 Gregory Szorc merge: use constants for actions