Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 601:8865eb8ade99
Add globals to templater/fixup RSS
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add globals to templater/fixup RSS
This removes a bunch of duplicate header() and footer() bits and makes
url and reponame available to all templates.
Fix up RSS bits to use url
Fix strftime call
manifest hash: 63e616e4c7f517a630d80429336817d64e900b68
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyLlRywK+sNU5EO8RAj9IAJkBDzMQaOwRmF0q8tRmVRnzHCjShACfSTCj
dbfAWg1crv/mUuRZlWL6Tc4=
=Z331
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sun, 03 Jul 2005 20:21:37 -0800 |
parents | eb46971fc57f |
children | c5df1a9c5276 |
line wrap: on
line source
+ hg init + echo nothing + hg add a + hg commit -t ancestor -u test -d '0 0' + echo something + hg commit -t branch1 -u test -d '0 0' + hg co 0 + echo 'something else' + hg commit -t branch2 -u test -d '0 0' + export HGMERGE=merge + HGMERGE=merge + hg up -m 1 merge: warning: conflicts during merge merging a merging a failed! + hg id 32e80765d7fe+75234512624c+ tip + grep -Ev '>>>|<<<' a something else ======= something + hg status C a ? .out