diff mercurial/hg.py @ 1771:e22bbca2e82b

hgmerge: add and use ask_if_merged function This patch, unlike the earlier ones, doesn't use unportable select builtin.
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Tue, 21 Feb 2006 15:48:12 -0600
parents c81d264cd17d
children dec6d3c13dbf
line wrap: on
line diff