mercurial at 26770: 7 new changesets

[Mercurial Commits]

7 new changesets in mercurial:

http://selenic.com/repo/hg//rev/7ce6fd705495
changeset:   26764:7ce6fd705495
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Thu Oct 15 00:45:20 2015 -0700
summary:     commands.resolve: support printing out driver-resolved files

http://selenic.com/repo/hg//rev/45976219eb80
changeset:   26765:45976219eb80
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Thu Oct 15 00:49:07 2015 -0700
summary:     merge.mergestate: add a way to get the other side of the merge

http://selenic.com/repo/hg//rev/a83110faece1
changeset:   26766:a83110faece1
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Thu Oct 15 00:57:56 2015 -0700
summary:     merge.mergestate: add a way to get the merge driver state

http://selenic.com/repo/hg//rev/69a121c378ef
changeset:   26767:69a121c378ef
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Thu Oct 15 01:02:32 2015 -0700
summary:     localrepo.commit: abort if merge driver's conclude step hasn't been run yet

http://selenic.com/repo/hg//rev/ac68769a5985
changeset:   26768:ac68769a5985
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Thu Oct 15 01:04:46 2015 -0700
summary:     merge.mergestate: only check for merge driver when property is accessed

http://selenic.com/repo/hg//rev/5b00ec4c05cb
changeset:   26769:5b00ec4c05cb
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Thu Oct 15 01:06:29 2015 -0700
summary:     merge.mergestate: set merge driver state to 's' if there's none present

http://selenic.com/repo/hg//rev/3d1978cc949e
changeset:   26770:3d1978cc949e
bookmark:    @
tag:         tip
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Thu Oct 15 01:09:58 2015 -0700
summary:     commands.resolve: print out warning when only driver-resolved files remain

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