1. 2008-02-27 [1] Bug: Resolve conflict using "theirs" in .resx files tortoises Petr Machek 2. 2008-02-16 [2] (No Subject) tortoises TortoiseSVN