Use changelogentry.tmpl for search results, too. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use changelogentry.tmpl for search results, too. Since both are lists of changelog entries, they don't need to look different. This fixes a bug where only changelogentry was updated, but searchentry not. manifest hash: 9bfe7a3dd4512d3ee4e5538f369371bce6d55520 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC13zrW7P1GVgWeRoRAghNAJ9Agd+uPQ2iGdHAnjebr2R/RzAzUACdEyWq +yKY7wp16TD72ls6Q49LHJg= =9aSM -----END PGP SIGNATURE-----

+ 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