Mercurial > hg
log tests/test-up-local-change.t @ 52216:fa58f4f97337 stable tip
| age | author | description |
|---|---|---|
| Fri, 03 Dec 2021 21:41:43 -0800 | Martin von Zweigbergk | filemerge: make `_filemerge()` do both premerge and merge |
| Thu, 02 Dec 2021 22:59:36 -0800 | Martin von Zweigbergk | mergestate: merge `preresolve()` into `resolve()` |
| Fri, 29 Jan 2021 15:56:08 -0800 | Martin von Zweigbergk | errors: use StateError more in merge module |
| Mon, 07 Dec 2020 20:32:05 -0500 | Matt Harbison | tests: correct the output order about starting a background thread for Windows |
| Thu, 03 Sep 2020 13:25:29 +0530 | Pulkit Goyal | merge: move initial handling of mergeactions near to later one |
| Wed, 22 Jan 2020 15:20:12 -0800 | Martin von Zweigbergk | copies: move early return in mergecopies() earlier |
| Fri, 12 Apr 2019 21:41:51 -0700 | Martin von Zweigbergk | copies: delete debug message about changes since common ancestor |