Mercurial > hg
log
age | author | description |
---|---|---|
Sun, 11 Oct 2015 23:58:07 -0700 | Siddharth Agarwal | resolve: perform all premerges before performing any file merges (BC) |
Sun, 11 Oct 2015 23:56:44 -0700 | Siddharth Agarwal | test-resolve.t: add some tests for .orig file contents |
Sun, 11 Oct 2015 23:54:40 -0700 | Siddharth Agarwal | test-resolve.t: add some output to show order of operations |
Sun, 11 Oct 2015 21:56:39 -0700 | Siddharth Agarwal | merge.mergestate: perform all premerges before any merges (BC) |