Mercurial > hg

diff mercurial/mergeutil.py @ 47054:9cea55ca1175 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
git: ensure all dirstate state values are bytes I'm not sure how this particular git status occurs, but after the fallout of issue 6510 and getting into the issue 6511 state where `git status` shows the files as modified in both the "to be committed" and "not staged" lists, `hg diff` was crashing in `workingctx.__contains__()`. Differential Revision: https://phab.mercurial-scm.org/D10532
author Matt Harbison <matt_harbison@yahoo.com>
date Wed, 28 Apr 2021 17:05:32 -0400
parents d4ba4d51f85f
children 6000f5b25c9b
line wrap: on
line diff