Fri, 17 Aug 2018 10:24:29 +0900 | Yuya Nishihara | branchmap: strip '\n' read from cache file as before | changeset | files |
Fri, 17 Aug 2018 10:21:25 +0900 | Yuya Nishihara | rebase: do not pass in user option to rollback in-memory merge conflict | changeset | files |
Fri, 17 Aug 2018 10:19:17 +0900 | Yuya Nishihara | rebase: add test for in-memory merge conflicts | changeset | files |
Thu, 16 Aug 2018 18:53:51 +0000 | Gregory Szorc | rebase: call _dorebase() properly | changeset | files |
Thu, 16 Aug 2018 16:59:40 +0300 | Pulkit Goyal | context: make sure file is not deleted while checking path conflicts | changeset | files |
Thu, 16 Aug 2018 16:53:48 +0300 | Pulkit Goyal | tests: demonstrate that IMM needs to be smarter with path conflicts | changeset | files |