diff mercurial/merge.py @ 12316:4134686b83e1

tests: add exit codes to unified tests
author Matt Mackall <mpm@selenic.com>
date Thu, 16 Sep 2010 17:51:32 -0500
parents 28e2e3804f2e
children 6f0d9d79111f
line wrap: on
line diff