log tests/test-import-merge.t @ 23860:bead0c7b4f68

age author description
Wed, 27 Aug 2014 18:35:34 +0200 Matt Mackall merge with stable
Wed, 27 Aug 2014 23:10:06 +0900 FUJIWARA Katsunori import: show the warning message for failure of merging stable
Sat, 16 Aug 2014 10:43:59 +0900 FUJIWARA Katsunori import: change "editform" to distinguish merge commits from others
Mon, 20 Jan 2014 17:09:20 -0600 Matt Mackall test-import-merge: mangle file in binary mode
Mon, 26 Aug 2013 15:20:44 -0700 Danek Duvall solaris: tests can't use tail -n
Sun, 10 Feb 2013 23:01:12 +0000 Kevin Bullock import: don't rollback on failed import --exact (issue3616)
Mon, 11 Jun 2012 01:40:51 +0200 Mads Kiilerich tests: add missing trailing 'cd ..'
Wed, 16 Nov 2011 12:53:10 +0100 Patrick Mezard import: fix parent selection when importing merges stable