Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho change tests to use simplemerge by default
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho polish the simplemerge command; add a test
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
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho add mdiff.get_matching_blocks
Mon, 16 Apr 2007 13:31:15 -0300 Alexis S. L. Carvalho Merge with crew-stable.
Wed, 25 Apr 2007 13:35:18 -0500 Matt Mackall hg serve: don't do DNS lookups
Sat, 27 Jan 2007 23:07:06 +0100 Thomas Arendsen Hein Fix segfaults when parsing bdiff hunks in mpatch.decode() and .patchedsize()
(0) -3000 -1000 -300 -100 -30 -10 -8 +8 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip