| 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()`
|
| Wed, 10 Mar 2021 13:14:32 +0530 |
Pulkit Goyal |
commit: get info from mergestate whether a file was merged or not
|
| Wed, 30 Sep 2020 18:07:21 +0530 |
Pulkit Goyal |
merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED
|
| Wed, 30 Sep 2020 17:51:40 +0530 |
Pulkit Goyal |
tests: fix a typo in `desc()` revset in test-merge-criss-cross.t
|
| Wed, 30 Sep 2020 15:46:54 +0530 |
Pulkit Goyal |
merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED
|
| Mon, 24 Aug 2020 15:35:34 +0530 |
Pulkit Goyal |
merge: store cases when a file is absent post merge in commitinfo
|
| Mon, 14 Sep 2020 15:08:15 +0530 |
Pulkit Goyal |
tests: add some more debugmergestate calls in `test-merge-criss-cross.t`
|
| Thu, 03 Sep 2020 13:58:14 +0530 |
Pulkit Goyal |
commit: force create a new filenode if it was set in mergestate by merge
|
| Thu, 03 Sep 2020 13:44:06 +0530 |
Pulkit Goyal |
merge: store commitinfo if these is a dc or cd conflict
|
| Mon, 14 Sep 2020 14:11:45 +0530 |
Pulkit Goyal |
tests: add some debugmergestate calls in `test-merge-criss-cross.t`
|
| Thu, 03 Sep 2020 13:54:46 +0530 |
Pulkit Goyal |
tests: add few debugrevlogindex and a log call to see changes in next test
|
| Mon, 14 Sep 2020 14:31:23 +0530 |
Pulkit Goyal |
configitems: add a new config option to control new filenode functionality
|
| Wed, 09 Sep 2020 16:49:19 +0530 |
Pulkit Goyal |
mergestate: introduce a new ACTION_KEEP_NEW
|
| Thu, 03 Sep 2020 13:25:29 +0530 |
Pulkit Goyal |
merge: move initial handling of mergeactions near to later one
|
