log tests/test-merge9.t @ 26228:0fd20a71abdb

age author description
Thu, 24 Jul 2014 14:29:08 -0700 Nathan Goldbaum resolve: report no argument warning using a hint stable
Mon, 11 Jun 2012 01:40:51 +0200 Mads Kiilerich tests: add missing trailing 'cd ..'
Wed, 16 Nov 2011 18:04:19 -0600 Matt Mackall merge: give a special message for internal:merge failure (issue3105)