Mercurial > hg
log tests/test-merge9.t @ 51936:c6899b334d56 default tip
| age | author | description |
|---|---|---|
| Thu, 02 Dec 2021 22:59:36 -0800 | Martin von Zweigbergk | mergestate: merge `preresolve()` into `resolve()` |
| Tue, 06 Oct 2020 22:36:15 -0700 | Martin von Zweigbergk | errors: introduce InputError and use it from commands and cmdutil |
| Mon, 08 Jan 2018 19:41:47 +0530 | Pulkit Goyal | merge: add `--abort` flag which can abort the merge |
| Sun, 11 Oct 2015 21:56:39 -0700 | Siddharth Agarwal | merge.mergestate: perform all premerges before any merges (BC) |
| Fri, 09 Oct 2015 13:54:52 -0700 | Siddharth Agarwal | simplemerge: move conflict warning message to filemerge |
| Fri, 25 Sep 2015 03:51:46 -0400 | timeless | resolve: consistently describe re-merge + unresolved |
| Thu, 24 Jul 2014 14:29:08 -0700 | Nathan Goldbaum | resolve: report no argument warning using a hint stable |