Mercurial > hg
log
age | author | description |
---|---|---|
Sun, 11 Oct 2015 20:12:12 -0700 | Siddharth Agarwal | merge: introduce a preresolve function |
Sun, 11 Oct 2015 18:37:54 -0700 | Siddharth Agarwal | merge.mergestate._resolve: also return completed status |
Sun, 11 Oct 2015 18:29:50 -0700 | Siddharth Agarwal | merge.mergestate: add a wrapper around resolve |
Fri, 09 Oct 2015 13:54:52 -0700 | Siddharth Agarwal | simplemerge: move conflict warning message to filemerge |
Sun, 11 Oct 2015 15:04:00 -0700 | Siddharth Agarwal | filemerge: clean up some dead code |
Mon, 12 Oct 2015 14:15:04 -0400 | Augie Fackler | run-tests: add b-prefix on two strings to fix python3 support |
Sun, 11 Oct 2015 20:47:14 -0700 | Siddharth Agarwal | filemerge: break overall filemerge into separate premerge and merge steps |