log tests/test-merge-local.out @ 10944:6f1894d6a6b0 stable

age author description
Mon, 19 Apr 2010 20:41:53 +0200 Benoit Boissinot filemerge: use working dir parent as ancestor for backward wdir merge stable
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: allow merging going backwards
Fri, 11 Apr 2008 12:52:56 -0500 Matt Mackall resolve: new command