Thu, 04 Oct 2007 19:44:37 -0500 | Matt Mackall | merge: add debug diagnostics for findcopies | file | diff | annotate |
Sat, 28 Apr 2007 17:55:45 -0300 | Alexis S. L. Carvalho | run-tests.py: pass -L/--label to simplemerge | file | diff | annotate |
Mon, 16 Apr 2007 20:17:39 -0300 | Alexis S. L. Carvalho | change tests to use simplemerge by default | file | diff | annotate |
Tue, 10 Oct 2006 02:15:20 -0500 | Matt Mackall | merge: various tidying | file | diff | annotate |
Tue, 10 Oct 2006 01:16:06 -0500 | Matt Mackall | merge: shortcircuit filemerge for identical files | file | diff | annotate |
Mon, 09 Oct 2006 21:27:04 -0500 | Matt Mackall | filemerge: use contexts rather than my and other | file | diff | annotate |
Mon, 02 Oct 2006 12:04:48 -0500 | Matt Mackall | merge: extend file merge function for renames | file | diff | annotate |