Thu, 23 Feb 2006 18:10:04 +0100 |
Radoslaw Szkodzinski |
hgmerge: do not use file with markers in tools merging themselves
|
Thu, 23 Feb 2006 14:42:47 +0100 |
Thomas Arendsen Hein |
Fix hgmerge: mkdir "'/tmp'/hgmerge..." and ask_if_merged() didn't work.
|
Tue, 21 Feb 2006 15:48:22 -0600 |
Radoslaw Szkodzinski |
hgmerge: add meld support
|
Tue, 21 Feb 2006 15:48:19 -0600 |
Radoslaw Szkodzinski |
hgmerge: improve "apps not found" message
|
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
|