Mercurial > public > mercurial-scm > hg
log mercurial/merge.py @ 30887:a95fc01aaffe
| age | author | description |
|---|---|---|
| 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 |
| Thu, 10 Nov 2016 02:21:15 -0800 | Durham Goode | merge: change modified indicator to be 20 bytes |
| Thu, 10 Nov 2016 02:19:16 -0800 | Durham Goode | dirstate: change added/modified placeholder hash length to 20 bytes |