| Fri, 17 Aug 2018 10:25:39 +0900 |
Yuya Nishihara |
branchmap: close cache file properly
|
| Fri, 17 Aug 2018 10:24:29 +0900 |
Yuya Nishihara |
branchmap: strip '\n' read from cache file as before
|
| Fri, 17 Aug 2018 10:21:25 +0900 |
Yuya Nishihara |
rebase: do not pass in user option to rollback in-memory merge conflict
|
| Fri, 17 Aug 2018 10:19:17 +0900 |
Yuya Nishihara |
rebase: add test for in-memory merge conflicts
|
| Thu, 16 Aug 2018 18:53:51 +0000 |
Gregory Szorc |
rebase: call _dorebase() properly
|
| Thu, 16 Aug 2018 16:59:40 +0300 |
Pulkit Goyal |
context: make sure file is not deleted while checking path conflicts
|
| Thu, 16 Aug 2018 16:53:48 +0300 |
Pulkit Goyal |
tests: demonstrate that IMM needs to be smarter with path conflicts
|
| Thu, 16 Aug 2018 16:36:32 +0300 |
Pulkit Goyal |
tests: don't create new repo inside existing repo in test-rebase-inmemory.t
|
| Wed, 25 Jul 2018 13:40:42 -0400 |
Augie Fackler |
tests: remove test-py3-commands.t
|
| Wed, 25 Jul 2018 13:41:21 -0400 |
Augie Fackler |
tests: update test-check-py3-compat.t output in the py3exe branch
|
| Wed, 15 Aug 2018 17:40:21 -0700 |
Kyle Lippincott |
overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960)
|
| Tue, 14 Aug 2018 22:20:28 +0900 |
FUJIWARA Katsunori |
filemerge: show actual capabilities of internal merge tools
|
| Wed, 15 Aug 2018 22:24:50 +0900 |
FUJIWARA Katsunori |
filemerge: add config knob to check capabilities of internal merge tools
|
| Wed, 15 Aug 2018 22:24:38 +0900 |
FUJIWARA Katsunori |
filemerge: show warning if chosen tool has no binary files capability
|
| Tue, 14 Aug 2018 20:15:51 +0900 |
FUJIWARA Katsunori |
filemerge: add the function to examine a capability of a internal tool
|
| Tue, 14 Aug 2018 20:08:27 +0900 |
FUJIWARA Katsunori |
filemerge: set actual capabilities of internal merge tools
|
