log hgmerge @ 1772:b1a7fd503a29

age author description
Tue, 21 Feb 2006 15:48:16 -0600 Radoslaw Szkodzinski hgmerge: logic changes
Tue, 21 Feb 2006 15:48:12 -0600 Radoslaw Szkodzinski hgmerge: add and use ask_if_merged function
Tue, 21 Feb 2006 15:48:09 -0600 Radoslaw Szkodzinski hgmerge: fix diff+patch detection; cleanups
Mon, 06 Feb 2006 17:32:10 -0600 Radoslaw Szkodzinski hgmerge: various cleanups
Mon, 06 Feb 2006 17:32:06 -0600 Radoslaw Szkodzinski hgmerge: add cleanup functions
Mon, 06 Feb 2006 17:32:00 -0600 Radoslaw Szkodzinski hgmerge: add and use more tool variables
Mon, 30 Jan 2006 12:02:12 +1300 Brendan Cully Safer version of FileMerge merge