comparison hgmerge @ 340:97a897d32dfc

Handle the case where the current working copy is not based on a checkout. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Handle the case where the current working copy is not based on a checkout. Print 'unknown' in verbose mode and nothing otherwise. manifest hash: 5742c3c3a762b77ee1aeb62ed53b8f2d8e47a05d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCr8WJW7P1GVgWeRoRAtNkAJ9Qea4u8GG8zdSk87qLApT88KMrgQCeO22w bJ12ieVHvLzc2NNAGV+zbeQ= =IYni -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 15 Jun 2005 07:07:05 +0100
parents f06a4a3b86a7
children 3d4d5f2aba9a 4fc63e22b1fe
comparison
equal deleted inserted replaced
339:a76fc9c4b67b 340:97a897d32dfc