mercurial at 26612: 8 new changesets

[Mercurial Commits]

8 new changesets in mercurial:

http://selenic.com/repo/hg//rev/ef21a2c41629
changeset:   26605:ef21a2c41629
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Sun Oct 11 12:31:08 2015 -0700
summary:     filemerge: add a wrapper around the filemerge function

http://selenic.com/repo/hg//rev/2a405d307f8c
changeset:   26606:2a405d307f8c
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Sun Oct 11 12:56:21 2015 -0700
summary:     filemerge: also return whether the merge is complete

http://selenic.com/repo/hg//rev/45a6233d5f50
changeset:   26607:45a6233d5f50
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Sun Oct 11 20:47:04 2015 -0700
summary:     filemerge: introduce a premerge flag and function

http://selenic.com/repo/hg//rev/ae5b60d3294f
changeset:   26608:ae5b60d3294f
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Thu Oct 08 00:19:20 2015 -0700
summary:     filemerge: deindent the parts of filemerge outside the try block

http://selenic.com/repo/hg//rev/47681e77e484
changeset:   26609:47681e77e484
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Sun Oct 11 20:02:53 2015 -0700
summary:     filemerge: only print out "merging f" output at premerge step

http://selenic.com/repo/hg//rev/f9f82c444ff7
changeset:   26610:f9f82c444ff7
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Sun Oct 11 20:04:40 2015 -0700
summary:     filemerge: only copy to backup during premerge step

http://selenic.com/repo/hg//rev/a5ff66e6d77a
changeset:   26611:a5ff66e6d77a
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Sun Oct 11 20:47:14 2015 -0700
summary:     filemerge: break overall filemerge into separate premerge and merge steps

http://selenic.com/repo/hg//rev/a38924f7680c
changeset:   26612:a38924f7680c
bookmark:    @
tag:         tip
user:        Augie Fackler <augie at google.com>
date:        Mon Oct 12 14:15:04 2015 -0400
summary:     run-tests: add b-prefix on two strings to fix python3 support

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