Mercurial > hg
log mercurial/merge.py @ 30902:e6932e9a262a
age | author | description |
---|---|---|
Wed, 08 Feb 2017 23:03:33 -0800 | Martin von Zweigbergk | merge: remove unused handling of default destination in merge.update() |
Wed, 08 Feb 2017 14:49:37 -0800 | Martin von Zweigbergk | update: localize logic around which ancestor to use |
Wed, 01 Feb 2017 02:10:30 +0100 | Mads Kiilerich | merge: more safe detection of criss cross merge conflict between dm and r stable |
Tue, 31 Jan 2017 03:25:59 +0100 | Mads Kiilerich | merge: fix crash on criss cross merge with dir move and delete (issue5020) stable |
Mon, 05 Dec 2016 17:40:01 +0100 | Gábor Stefanik | graft: support grafting changes to new file in renamed directory (issue5436) |
Wed, 23 Nov 2016 00:03:11 +0530 | Pulkit Goyal | py3: use pycompat.getcwd() instead of os.getcwd() |
Mon, 21 Nov 2016 21:52:19 -0500 | Augie Fackler | mergemod: drop support for merge.update without a target |