mercurial at 23398: 4 new changesets

[Mercurial Commits]

4 new changesets in mercurial:

http://selenic.com/repo/hg//rev/d9ebb475eede
changeset:   23395:d9ebb475eede
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Mon Nov 24 16:11:22 2014 -0800
summary:     merge: indent to prepare for next patch

http://selenic.com/repo/hg//rev/6a254a2dd37c
changeset:   23396:6a254a2dd37c
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Mon Nov 24 16:16:34 2014 -0800
summary:     merge: separate out "both created" cases

http://selenic.com/repo/hg//rev/c7c95838be9a
changeset:   23397:c7c95838be9a
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Mon Nov 24 16:42:36 2014 -0800
summary:     merge: break out "both renamed a -> b" case

http://selenic.com/repo/hg//rev/9da5a7413eb8
changeset:   23398:9da5a7413eb8
bookmark:    @
tag:         tip
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Mon Nov 24 16:17:02 2014 -0800
summary:     merge: use None as filename for base in 'both created' conflicts

-- 
Repository URL: http://selenic.com/repo/hg/