Sat, 05 Sep 2009 18:56:51 +0200 | Patrick Mezard | merge: exclude common ancestor from --preview (issue1818) | file | diff | annotate |
Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: refactor manifestmerge init to better report effective ancestor | file | diff | annotate |
Thu, 14 May 2009 16:03:17 +0200 | Dirkjan Ochtman | merge: add -S/--show option to review revisions without merging | file | diff | annotate |
Thu, 10 Apr 2008 15:02:24 -0500 | Matt Mackall | merge: introduce mergestate | file | diff | annotate |
Fri, 21 Mar 2008 11:06:02 +0100 | Dirkjan Ochtman | warn about new heads on commit (issue842) | file | diff | annotate |
Sun, 03 Feb 2008 19:29:05 -0600 | Matt Mackall | merge: allow smarter tool configuration | file | diff | annotate |
Thu, 04 Oct 2007 19:44:37 -0500 | Matt Mackall | merge: add debug diagnostics for findcopies | file | diff | annotate |
Wed, 01 Aug 2007 12:33:12 -0500 | Matt Mackall | merge: do early copy to deal with issue636 | file | diff | annotate |