| Thu, 02 Dec 2021 22:59:36 -0800 |
Martin von Zweigbergk |
mergestate: merge `preresolve()` into `resolve()`
|
| Tue, 23 Nov 2021 20:04:22 +0100 |
Simon Sapin |
rhg: Fix status desambiguation of symlinks and executable files
|
| Tue, 09 Nov 2021 19:55:46 +0100 |
Simon Sapin |
rhg: Enable `rhg status` in most tests
|
| Thu, 20 Jun 2019 11:40:47 -0700 |
Kyle Lippincott |
filemerge: make last line of prompts <40 english chars (issue6158)
|
| Thu, 11 Apr 2019 23:28:38 -0700 |
Martin von Zweigbergk |
copies: delete debug message about search limit
|
| Thu, 01 Nov 2018 14:35:18 +0100 |
Boris Feld |
test: remove changes preparing the drop of `HGMERGE`
|
| Thu, 01 Nov 2018 14:26:30 +0100 |
Boris Feld |
test: drop usage of `HGMERGE` in `test-merge-types.t`
|
| Mon, 08 Jan 2018 19:41:47 +0530 |
Pulkit Goyal |
merge: add `--abort` flag which can abort the merge
|
| Tue, 06 Jun 2017 22:17:39 +0530 |
Pulkit Goyal |
update: show the commit to which we updated in case of multiple heads (BC)
|
| Sat, 13 May 2017 03:28:36 +0900 |
FUJIWARA Katsunori |
filemerge: show warning about choice of :prompt only at an actual fallback
|
| Sat, 19 Nov 2016 15:41:37 -0800 |
Kostia Balytskyi |
conflicts: make spacing consistent in conflict markers
|
| Wed, 12 Oct 2016 12:22:18 +0200 |
Mads Kiilerich |
merge: clarify warning for (not) merging flags without ancestor
|
| Wed, 12 Oct 2016 12:22:18 +0200 |
Mads Kiilerich |
merge: only show "cannot merge flags for %s" warning if flags are different
|
| Wed, 12 Oct 2016 12:22:18 +0200 |
Mads Kiilerich |
tests: add test coverage of merging x flag without ancestor
|
