Mercurial > hg
log tests/test-resolve.t @ 29793:24991e7f775f
| age | author | description |
|---|---|---|
| Thu, 17 Mar 2016 14:50:29 +0000 | timeless | summary: move mergemod before parents to give access to ms |
| Thu, 24 Dec 2015 04:31:34 +0000 | timeless | resolve: when pats do not match, hint about path: |
| Fri, 05 Feb 2016 10:22:14 -0800 | Durham Goode | merge: add file ancestor linknode to mergestate |
| Mon, 07 Dec 2015 20:43:24 -0800 | Martin von Zweigbergk | merge: refuse update/merge if there are unresolved conflicts (BC) |
| Sun, 22 Nov 2015 21:20:08 -0500 | Matt Harbison | test-resolve: fix '--tool f' invocation for Windows |
| Wed, 18 Nov 2015 15:46:45 -0800 | Siddharth Agarwal | mergestate: handle additional record types specially |
| Wed, 18 Nov 2015 23:42:32 -0800 | Siddharth Agarwal | test-resolve.t: remove completely unnecessary line |