Mercurial > hg

annotate mercurial/templates/coal/map @ 45347:1aef38d973e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: pass mergeresult obj in _forgetremoved() (API) Instead of returning a dict of actions and then updating it, let's pass the object directly and update it there. This makes `updateactions()` on mergeresult unused and this patch removes that. After this patch, we have couple of methods left on mergeresult class which still exposes the internal dict based action storage. Differential Revision: https://phab.mercurial-scm.org/D8889
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 05 Aug 2020 16:52:51 +0530
parents 5f86818c95e5
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
29813
5f86818c95e5 coal: use inheritance to derive from paper
Matt Mackall <mpm@selenic.com>
parents: 26283
diff changeset
1 __base__ = ../paper/map
5f86818c95e5 coal: use inheritance to derive from paper
Matt Mackall <mpm@selenic.com>
parents: 26283
diff changeset
2 header = header.tmpl