Mercurial > hg
log tests/test-resolve.t @ 27010:f4fec0940278
| age | author | description |
|---|---|---|
| Wed, 18 Nov 2015 20:59:17 -0600 | Matt Mackall | merge with stable |
| Tue, 17 Nov 2015 15:43:21 -0800 | Siddharth Agarwal | test-resolve.t: switch to mergestate.read() |
| Sun, 15 Nov 2015 21:12:13 -0500 | Matt Harbison | tests: fix globs for Windows |
| Fri, 13 Nov 2015 15:56:02 -0800 | Siddharth Agarwal | resolve: restore .orig only after merge is fully complete (issue4952) stable |
| Tue, 10 Nov 2015 14:26:19 -0800 | Christian Delahousse | resolve: choose where .orig file locations are kept |
| Thu, 15 Oct 2015 01:15:22 -0700 | Siddharth Agarwal | commands.resolve: don't allow users to mark or unmark driver-resolved files |
| Sun, 11 Oct 2015 23:58:07 -0700 | Siddharth Agarwal | resolve: perform all premerges before performing any file merges (BC) |