comparison hgmerge @ 2141:ed631e83fa06

Corrected error message for incompatible revision flags.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 27 Apr 2006 21:03:07 +0200
parents 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
2140:6447a32aefce 2141:ed631e83fa06