Thu, 04 Aug 2005 17:23:31 +0100 If rejects are empty after using the editor, merge with diff+patch was ok.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Aug 2005 17:23:31 +0100] rev 830
If rejects are empty after using the editor, merge with diff+patch was ok.
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip