| Thu, 02 Dec 2021 22:59:36 -0800 |
Martin von Zweigbergk |
mergestate: merge `preresolve()` into `resolve()`
|
| Mon, 07 Dec 2020 20:32:05 -0500 |
Matt Harbison |
tests: correct the output order about starting a background thread for Windows
|
| Tue, 27 Oct 2020 15:33:15 -0700 |
Martin von Zweigbergk |
rebase: change and standarize template for rebase's one-line summary
|
| Fri, 13 Dec 2019 11:32:36 +0100 |
Pierre-Yves David |
test: document test-copy-move-merge.t
|
| Fri, 24 Jan 2020 10:39:55 -0800 |
Martin von Zweigbergk |
copies: print debug information about copies per side/branch
|
| 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
|
| Sun, 26 Aug 2018 19:14:26 +0300 |
Pulkit Goyal |
filemerge: fix the wrong placements of messages in prompt
|
| Sat, 25 Aug 2018 21:17:34 +0300 |
Pulkit Goyal |
filemerge: print the filename in quotes in prompt
|
| Mon, 20 Aug 2018 13:29:48 -0400 |
Augie Fackler |
merge: improve interactive one-changed one-deleted message (issue5550)
|
| Sun, 10 Dec 2017 22:50:57 -0500 |
Matt Harbison |
tests: remove (glob) annotations that were only for '\' matches
|
| Sun, 03 Sep 2017 02:34:01 +0530 |
Pulkit Goyal |
copytrace: move the default copytracing algorithm in a new function
|
| Sun, 03 Sep 2017 01:52:19 +0530 |
Pulkit Goyal |
copytrace: replace experimental.disablecopytrace config with copytrace (BC)
|
| Fri, 07 Jul 2017 18:51:46 -0700 |
Jun Wu |
rebase: use scmutil.cleanupnodes (issue5606) (BC)
|
| Fri, 12 Aug 2016 05:56:40 -0700 |
Simon Farnsworth |
merge: always use other, not remote, in user prompts
|
