| Tue, 18 Jan 2022 14:57:15 -0800 |
Martin von Zweigbergk |
rebase: set custom conflict label for base commit
|
| Thu, 20 Jan 2022 14:13:12 -0800 |
Martin von Zweigbergk |
filemerge: always define a "base" label
|
| Thu, 18 Mar 2021 18:24:59 -0400 |
Matt Harbison |
merge with stable
|
| Thu, 04 Mar 2021 17:35:58 +0530 |
Pulkit Goyal |
commit: reorder if-else conditional to give mergestate info priority
stable
|
| Fri, 15 Jan 2021 01:58:59 +0100 |
Joerg Sonnenberger |
branchmap: update rev-branch-cache incrementally
|
| Mon, 23 Nov 2020 16:48:13 -0800 |
Martin von Zweigbergk |
errors: raise StateError when there are unresolves merge conflicts
|
| Mon, 12 Oct 2020 12:44:18 -0700 |
Martin von Zweigbergk |
errors: introduce StateError and use it from commands and cmdutil
|
| Wed, 21 Oct 2020 19:00:16 -0700 |
Martin von Zweigbergk |
errors: add config that lets user get more detailed exit codes
|
| Tue, 27 Oct 2020 15:33:15 -0700 |
Martin von Zweigbergk |
rebase: change and standarize template for rebase's one-line summary
|
| Mon, 13 Jul 2020 16:42:44 -0700 |
Daniel Ploch |
error: unify the error message formats for 'rebase' and 'unshelve'
|
| Fri, 10 Jan 2020 14:22:20 -0800 |
Martin von Zweigbergk |
rebase: don't use rebased node as dirstate p2 (BC)
|
| Fri, 10 Jan 2020 17:46:10 -0800 |
Martin von Zweigbergk |
tests: add test of rebase with conflict in merge commit
|
| Wed, 11 Sep 2019 15:03:08 -0700 |
Martin von Zweigbergk |
bundle2: fix an off-by-one in debug message of number of parts
|
| Sun, 08 Sep 2019 09:42:53 +0200 |
Pierre-Yves David |
changegroup: move message about added changes to transaction summary
|
| Sun, 14 Jul 2019 23:21:28 -0700 |
Martin von Zweigbergk |
py3: fix formatting of branchmap log messages with repo.filtername=None
|
