| Fri, 03 Dec 2021 22:45:35 -0800 |
Martin von Zweigbergk |
filemerge: inline `_filemerge()` into `filemerge()`
|
| Fri, 03 Dec 2021 21:50:25 -0800 |
Martin von Zweigbergk |
tests: remove unnecessary explicit args from `failfilemerge.py`
|
| Thu, 08 Oct 2020 15:35:44 -0700 |
Martin von Zweigbergk |
errors: stop passing non-strings to Abort's constructor
|
| Sun, 06 Oct 2019 09:45:02 -0400 |
Augie Fackler |
formatting: blacken the codebase
|
| Mon, 11 Sep 2017 13:03:27 -0700 |
Phil Cohen |
merge: pass wctx to premerge, filemerge
|
| Mon, 17 Oct 2016 23:16:55 +0200 |
Mads Kiilerich |
spelling: fixes of non-dictionary words
|
| Fri, 12 Aug 2016 06:01:42 -0700 |
Simon Farnsworth |
merge: use labels in prompts to the user
|
| Sun, 03 Apr 2016 19:41:00 +0900 |
Yuya Nishihara |
tests: sort import lines in failfilemerge.py
|
| Fri, 05 Feb 2016 01:56:46 +0000 |
timeless |
rebase: update working directory when aborting (issue5084)
stable
|
