##// END OF EJS Templates
diff: extract function for getting possibly re-merged parent to diff against...
diff: extract function for getting possibly re-merged parent to diff against We'll want to reuse the logic that `hg diff --change` with `diff.merge` uses. At least `hg log -p` should reuse it. This patch therefore extracts that code to a function. Differential Revision: https://phab.mercurial-scm.org/D9957

File last commit:

r44486:ab595920 default
r47225:09fee527 default
Show More
__init__.py
8 lines | 300 B | text/x-python | PythonLexer
revlog: introduce an explicit NodeMap class for pure code...
r43924 # mercurial.revlogutils -- basic utilities for revlog
#
# Copyright 2019 Pierre-Yves David <pierre-yves.david@octobus.net>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import