##// END OF EJS Templates
graft: don't drop the second parent on unsuccessful merge (issue3498)...
graft: don't drop the second parent on unsuccessful merge (issue3498) This replicates the strategy of rebase, which postpones setparents and duplicatecopies after checking the merge stats. Without the second parent, resolve cannot redo merge.

File last commit:

r13964:616ad3f6 default
r17045:52ea9ce5 stable
Show More
template-vars.txt
42 lines | 1.5 KiB | text/plain | TextLexer
repo the name of the repo
rev a changeset.manifest revision
node a changeset node
changesets total number of changesets
file a filename
filerev a file revision
filerevs total number of file revisions
up the directory of the relevant file
path a path in the manifest, starting with "/"
basename a short pathname
date a date string
age age in hours, days, etc
line a line of text (escaped)
desc a description (escaped, with breaks)
shortdesc a short description (escaped)
author a name or email addressv(obfuscated)
parent a list of the parent
child a list of the children
tags a list of tag
header the global page header
footer the global page footer
files a list of file links
file_copies a list of pairs of name, source filenames
dirs a set of directory links
diff a diff of one or more files
annotate an annotated file
entries the entries relevant to the page
url base url of hgweb interface
logourl base url of logo
staticurl base url for static resources
Templates and commands:
changelog(rev) - a page for browsing changesets
naventry - a link for jumping to a changeset number
filenodelink - jump to file diff
fileellipses - printed after maxfiles
changelogentry - an entry in the log
manifest - browse a manifest as a directory tree