log tests/test-simplemerge.py @ 4726:f6e961c0155b

age author description
Tue, 19 Jun 2007 08:06:37 +0200 Thomas Arendsen Hein Cleanup of whitespace, indentation and line continuation.
Wed, 06 Jun 2007 20:22:52 +0200 Thomas Arendsen Hein Removed trailing whitespace and tabs from python files
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho actually port simplemerge to hg
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho Import 3-way merge code from bzr