log tests/test-double-merge @ 9462:1f54b1b7122f

age author description
Fri, 19 Jun 2009 13:58:48 +0200 Dirkjan Ochtman merge: rename -S/--show option to -P/--preview
Thu, 14 May 2009 16:03:17 +0200 Dirkjan Ochtman merge: add -S/--show option to review revisions without merging
Thu, 02 Aug 2007 14:51:49 +0200 Thomas Arendsen Hein The >| redirection does not exist in plain sh.
Wed, 01 Aug 2007 12:33:12 -0500 Matt Mackall merge: do early copy to deal with issue636