changeset 45296 | 8e8d513941b4 |
parent 45295 | 0e18861f96ab |
child 45367 | 3c783ff08d40 |
--- a/hgext/convert/hg.py Thu Jul 23 18:03:14 2020 +0530 +++ b/hgext/convert/hg.py Tue Jul 14 16:21:08 2020 +0530 @@ -217,6 +217,7 @@ """ anc = [p1ctx.ancestor(p2ctx)] # Calculate what files are coming from p2 + # TODO: mresult.commitinfo might be able to get that info mresult = mergemod.calculateupdates( self.repo, p1ctx,