Mercurial > hg > mercurial-crew-with-dirclash
view templates/changelog.tmpl @ 232:fc4a6e5b5812
hg resolve: merge a given node into the working directory
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hg resolve: merge a given node into the working directory
This is the first pass at working directory-based merges. Doing a
resolve adds a second parent to the working directory state for the
next commit.
manifest hash: 827b19995dd2d7686286da3b62c7d5fe3e0bc48c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoMSHywK+sNU5EO8RAnOkAJsHH9jviMJcQJ4JurFuSlrbIwKqRACdHgNC
kkfoAxX2E5jkuOeSJ1Hjalk=
=bdrT
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 03 Jun 2005 12:58:47 -0800 |
parents | f918a6fa2572 |
children | 9bdf5ae63d1f |
line wrap: on
line source
#header# <title>#repo|escape#: changelog</title> </head> <body> <div class="buttons"> <a href="?cmd=tags">tags</a> <a href="?cmd=manifest;manifest=#manifest#;path=/">manifest</a> </div> <h2>changelog for #repo|escape#</h2> <form> search: <input type="hidden" name="cmd" value="changelog"> <input name="rev" type="text" width="30"> navigate: <small>#changenav#</small><br/> </form> #entries# <form> search: <input type="hidden" name="cmd" value="changelog"> <input name="rev" type="text" width="30"> navigate: <small>#changenav#</small><br/> </form> #footer#