log hgmerge @ 1771:e22bbca2e82b

age author description
Tue, 21 Feb 2006 15:48:12 -0600 Radoslaw Szkodzinski hgmerge: add and use ask_if_merged function