comparison hgmerge @ 3148:adb246ce6736

fix newline in error message
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 22 Sep 2006 18:29:04 +0200
parents 6a03cff2b0f5
children e4480f2b61e9
comparison
equal deleted inserted replaced
3147:97420a49188d 3148:adb246ce6736