Sun, 15 Oct 2006 16:18:09 -0500 | Matt Mackall | merge: if filemerge skips merge, report as updated | file | diff | annotate |
Fri, 13 Oct 2006 17:58:04 -0500 | Matt Mackall | merge: update dirstate correctly for non-branchmerge updates | file | diff | annotate |
Thu, 12 Oct 2006 14:49:19 -0500 | Matt Mackall | merge: turn followcopies on by default | file | diff | annotate |
Tue, 10 Oct 2006 03:39:44 -0500 | Matt Mackall | merge: pull user messages out to hg.py | file | diff | annotate |
Tue, 10 Oct 2006 02:31:02 -0500 | Matt Mackall | merge: update some docstrings | file | diff | annotate |
Tue, 10 Oct 2006 02:15:20 -0500 | Matt Mackall | merge: various tidying | file | diff | annotate |
Tue, 10 Oct 2006 01:43:58 -0500 | Matt Mackall | merge: use contexts in checkunknown and forgetremoved | file | diff | annotate |