diff tests/test-conflict.out @ 387:c07c6fb2f0a8

Show tags in hg history etc. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Show tags in hg history etc. manifest hash: 5520d8f5be86d5183c5b6f84e25cb99eb35ad4b7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCsphGW7P1GVgWeRoRAtujAJ97McEv8gL8m1uZz79ufKgbzFf6ZACfd7vQ 49wFPb65oMSwro9XjOoGgCk= =BSsw -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 17 Jun 2005 10:30:46 +0100
parents e5d769afd3ef
children ee4c80d294e5
line wrap: on
line diff