log tests/test-simplemerge.py.out @ 23172:e955549cd045

age author description
Tue, 05 Aug 2014 14:56:25 -0700 Pierre-Yves David simplemerge: burn "minimal" feature to the ground
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho actually port simplemerge to hg