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
Showing
- hgext/beautifygraph.py 2 additions, 0 deletionshgext/beautifygraph.py
- mercurial/hgweb/webutil.py 1 addition, 1 deletionmercurial/hgweb/webutil.py
- mercurial/logcmdutil.py 3 additions, 2 deletionsmercurial/logcmdutil.py
- mercurial/templatekw.py 17 additions, 5 deletionsmercurial/templatekw.py
- relnotes/next 6 additions, 1 deletionrelnotes/next
- tests/test-backout.t 2 additions, 2 deletionstests/test-backout.t
- tests/test-graft-interrupted.t 4 additions, 4 deletionstests/test-graft-interrupted.t
- tests/test-rebase-collapse.t 1 addition, 1 deletiontests/test-rebase-collapse.t
- tests/test-strip.t 1 addition, 1 deletiontests/test-strip.t
- tests/test-update-branches.t 1 addition, 1 deletiontests/test-update-branches.t
Loading
Please register or sign in to comment