Mercurial > hg
log tests/test-merge9 @ 9296:5043a5b16d91
age | author | description |
---|---|---|
Sun, 26 Apr 2009 14:29:02 +0200 | Martin Geisler | tests: removed redundant "-d '0 0'" from test scripts |
Mon, 16 Mar 2009 16:58:41 -0500 | Matt Mackall | resolve: keep .orig files |
Fri, 19 Dec 2008 16:47:36 -0600 | Matt Mackall | resolve: require -a switch to resolve all files |
Fri, 11 Apr 2008 12:52:56 -0500 | Matt Mackall | resolve: new command |
Fri, 22 Jun 2007 20:44:40 -0300 | Alexis S. L. Carvalho | merge: fix small bug with a failed merge across a rename |