##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

histedit: make check for unresolved conflicts explicit (issue5545)...
histedit: make check for unresolved conflicts explicit (issue5545) Previously, we'd rely on the implicit check that `localrepo.commit` did. The problem is that that check only happened when the working copy was dirty. With a "clean" working copy but unresolved conflicts we'd get into a broken state. To fix that, do what rebase does and check for unresolved conflicts at the start of histedit --continue.
Gregory Szorc - - Load All Authors

File last commit:

r31944:99bc9314 default
r32057:e5ffc91a stable
Show More
map-cmdline.show
3 lines | 294 B | text/plain | TextLexer
/ mercurial / templates / map-cmdline.show
History | Annotation | Raw |Copy content |Copy permalink
# TODO add label() once we figure out which namespace the labels belong on.
showbookmarks = '{if(active, "*", " ")} {pad(bookmark, longestbookmarklen + 4)}{shortest(node, 5)}\n'
showunderway = '{shortest(node, 5)}{if(branches, " ({branch})")}{if(bookmarks, " ({bookmarks})")} {desc|firstline}'