log mercurial/hg.py @ 31168:41a9edc5d00f

age author description
Mon, 13 Feb 2017 00:05:55 -0800 Martin von Zweigbergk update: allow setting default update check to "noconflict"
Mon, 13 Feb 2017 16:03:05 -0800 Martin von Zweigbergk update: add experimental config for default way of handling dirty wdir
Mon, 13 Feb 2017 12:58:37 -0800 Martin von Zweigbergk update: accept --merge to allow merging across topo branches (issue5125)