Mercurial > hg
comparison mercurial/namespaces.py @ 44345:14d0e89520a2
graphlog: use '%' for other context in merge conflict
This lets the user more easily find the commit that is involved in the
conflict, such as the source of `hg update -m` or the commit being
grafted by `hg graft`.
Differential Revision: https://phab.mercurial-scm.org/D8043
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 28 Jan 2020 21:49:50 -0800 |
parents | d783f945a701 |
children | 59ad165f6cdb |
comparison
equal
deleted
inserted
replaced
44344:ab632e27f296 | 44345:14d0e89520a2 |
---|