log mercurial/merge.py @ 30362:3c6893ba2d36

age author description
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
Wed, 12 Oct 2016 12:22:18 +0200 Mads Kiilerich merge: clarify warning for (not) merging flags without ancestor
Wed, 12 Oct 2016 12:22:18 +0200 Mads Kiilerich merge: only show "cannot merge flags for %s" warning if flags are different
Sun, 02 Oct 2016 17:31:32 +0900 Yuya Nishihara merge: update doc of manifestmerge() per 18c2184c27dc
Sat, 08 Oct 2016 01:25:28 -0700 Simon Farnsworth merge: use labels in subrepo merge
Tue, 30 Aug 2016 09:22:53 -0700 Martin von Zweigbergk util: rename checkcase() to fscasesensitive() (API)
Tue, 23 Aug 2016 17:58:53 -0700 Siddharth Agarwal merge: remove files with extra actions from merge action list
Fri, 12 Aug 2016 05:56:40 -0700 Simon Farnsworth merge: always use other, not remote, in user prompts
Fri, 12 Aug 2016 06:01:42 -0700 Simon Farnsworth merge: use labels in prompts to the user
Thu, 21 Jul 2016 15:55:47 -0700 Kostia Balytskyi update: fix bug when update tries to modify folder symlink stable