Mercurial > hg
log
| age | author | description |
|---|---|---|
| Fri, 24 Jul 2020 17:52:33 +0530 | Pulkit Goyal | merge: pass mergeresult obj instead of actions dict in _resolvetrivial() |
| Fri, 24 Jul 2020 17:49:13 +0530 | Pulkit Goyal | merge: pass mergeresult obj instead of actions in _filternarrowactions() |
| Fri, 24 Jul 2020 17:31:26 +0530 | Pulkit Goyal | merge: pass mergeresult in checkpassconflicts() instead of actions (API) |
| Fri, 24 Jul 2020 16:23:55 +0530 | Pulkit Goyal | merge: add removefile() to mergeresult object |
| Fri, 24 Jul 2020 16:18:39 +0530 | Pulkit Goyal | merge: introduce mergeresult.addfile() and use it |
| Fri, 24 Jul 2020 15:56:11 +0530 | Pulkit Goyal | merge: make mergeresult constructor initialize empty object |
| Fri, 24 Jul 2020 15:15:20 +0530 | Pulkit Goyal | merge: improve documentation of fbid dict used for merge bid |