Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/manifest.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 | cf40d2a30fef |
children | c21b54f7f7b8 74d3f5336b66 |