diff mercurial/merge.py @ 5312:189d82b6962e

bisect: don't write data on failure
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 22 Sep 2007 18:35:53 +0200
parents 90d9ec0dc69d
children 17ed9b9a0d03
line wrap: on
line diff