Mercurial > public > mercurial-scm > hg
log mercurial/merge.py @ 30519:20a42325fdef
| age | author | description |
|---|---|---|
| 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 |
| Mon, 17 Oct 2016 23:16:55 +0200 | Mads Kiilerich | spelling: fixes of non-dictionary words |
| Thu, 25 Aug 2016 22:02:26 +0200 | G?bor Stefanik | update: enable copy tracing for backwards and non-linear updates |
| Tue, 04 Oct 2016 04:06:48 -0700 | Stanislau Hlebik | update: warn if cwd was deleted |