comparison mercurial/error.py @ 8170:6c4fdde87f90

cvsps: add test for merge detection (issue1615). Currently only testing convert.cvsps.mergefrom; this script should also probably test convert.cvsps.mergeto.
author Greg Ward <greg-hg@gerg.ca>
date Sun, 19 Apr 2009 12:20:39 -0400
parents fca54469480e
children 46293a0c7e9f
comparison
equal deleted inserted replaced
8169:6584953be356 8170:6c4fdde87f90