comparison mercurial/merge.py @ 5082:dc2e512cb89a

CVS import: Support new-style .cvspass-file format. Based on an email from Ralf.Leibold at nuance dot com
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 07 Aug 2007 15:56:26 +0200
parents 8d9bdcbb2b18
children 2ef14e29e538 ad6b97132b81
comparison
equal deleted inserted replaced
5081:ea7b982b6c08 5082:dc2e512cb89a