comparison mercurial/simplemerge.py @ 6670:be55b1a6d4b1

merge from crew-stable
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 13 Jun 2008 12:34:23 +0200
parents e75aab656f46
children 810ca383da9c
comparison
equal deleted inserted replaced
6668:034f444902d9 6670:be55b1a6d4b1