| 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()`
|
| 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
|
| Mon, 24 Feb 2020 16:59:35 -0500 |
Matt Harbison |
tests: stabilize test-rename-merge2.t on Windows
|
| Wed, 22 Jan 2020 13:29:26 -0800 |
Martin von Zweigbergk |
merge: when rename was made on both sides, use ancestor as merge base
|
| 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:22:54 -0700 |
Martin von Zweigbergk |
copies: calculate mergecopies() based on pathcopies()
|
| Mon, 15 Apr 2019 14:09:18 -0700 |
Martin von Zweigbergk |
copies: delete debug message about "unmatched files new in both"
|
| Thu, 11 Apr 2019 23:28:38 -0700 |
Martin von Zweigbergk |
copies: delete debug message about search limit
|
| Mon, 15 Apr 2019 16:41:43 -0700 |
Martin von Zweigbergk |
copies: fix up "fullcopy" with missing entries from "copy"
|
| Mon, 15 Apr 2019 15:28:41 -0700 |
Martin von Zweigbergk |
tests: delete unused function in test-rename-merge2.t
|
| Tue, 18 Sep 2018 23:47:21 -0400 |
Matt Harbison |
tests: quote PYTHON usage
|
| Tue, 04 Sep 2018 17:33:22 +0300 |
Pulkit Goyal |
py3: write the file in str mode in tests/test-rename-merge2.t
|
