diff mercurial/merge.py @ 4073:95ffa36d1d2a

BeOS compatibility support
author Andrew Bachmann <andrewbachmann@gmail.com>
date Tue, 02 Jan 2007 21:40:20 -0800
parents 20da40cc1c73
children bb70d5fa02ae
line wrap: on
line diff