| Fri, 03 Dec 2021 21:41:43 -0800 |
Martin von Zweigbergk |
filemerge: make `_filemerge()` do both premerge and merge
|
file |
diff |
annotate
|
| Thu, 02 Dec 2021 22:59:36 -0800 |
Martin von Zweigbergk |
mergestate: merge `preresolve()` into `resolve()`
|
file |
diff |
annotate
|
| Thu, 04 Mar 2021 08:20:19 -0800 |
Martin von Zweigbergk |
copies: filter out copies grafted from another branch
|
file |
diff |
annotate
|
| Mon, 07 Dec 2020 20:32:05 -0500 |
Matt Harbison |
tests: correct the output order about starting a background thread for Windows
|
file |
diff |
annotate
|
| Mon, 23 Nov 2020 16:48:13 -0800 |
Martin von Zweigbergk |
errors: raise StateError when there are unresolves merge conflicts
|
file |
diff |
annotate
|
| Mon, 12 Oct 2020 12:44:18 -0700 |
Martin von Zweigbergk |
errors: introduce StateError and use it from commands and cmdutil
|
file |
diff |
annotate
|
| Tue, 06 Oct 2020 22:36:15 -0700 |
Martin von Zweigbergk |
errors: introduce InputError and use it from commands and cmdutil
|
file |
diff |
annotate
|
| Thu, 03 Sep 2020 13:25:29 +0530 |
Pulkit Goyal |
merge: move initial handling of mergeactions near to later one
|
file |
diff |
annotate
|
| Tue, 26 May 2020 11:14:07 -0400 |
Charles Chamberlain |
graft-state: save --base in graft's state, fixing bug with graft --continue
stable
|
file |
diff |
annotate
|
| Tue, 14 Apr 2020 19:09:56 -0400 |
Valentin Gatien-Baron |
graft: exit 1 on conflicts, like merge
|
file |
diff |
annotate
|
| Thu, 05 Mar 2020 08:37:08 -0800 |
Martin von Zweigbergk |
commit: print debug message when clearing dirstate and wdir clean
|
file |
diff |
annotate
|
| Mon, 17 Feb 2020 20:30:03 -0500 |
Valentin Gatien-Baron |
graft: always allow hg graft --base . (issue6248)
|
file |
diff |
annotate
|
| Fri, 24 Jan 2020 10:39:55 -0800 |
Martin von Zweigbergk |
copies: print debug information about copies per side/branch
|
file |
diff |
annotate
|
| Fri, 27 Dec 2019 15:14:19 -0800 |
Martin von Zweigbergk |
graftcopies: use _filter() for filtering out invalid copies
|
file |
diff |
annotate
|
| Fri, 27 Dec 2019 22:40:52 -0800 |
Martin von Zweigbergk |
tests: avoid grafting the same change over and over
|
file |
diff |
annotate
|