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 12:37:30 -0500 |
Matt Mackall |
Merge with stable
|
Mon, 16 Apr 2007 12:27:49 -0500 |
Matt Mackall |
Merge with crew
|
Mon, 16 Apr 2007 12:24:52 -0500 |
Matt Mackall |
merge: fix quadratic behavior in find-copies
|