diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-10-08 15:26:57 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-10-08 15:26:57 +0000 |
| commit | c63bd810e953429b728adbadf60f10a08e6d4a06 (patch) | |
| tree | 5f13f34603b9b24ca169a0509ec26fd28683c2c3 /tests.branching | |
| parent | df64e4300d7b39c29ce75273196a7894c86a98a9 (diff) | |
| download | morph-c63bd810e953429b728adbadf60f10a08e6d4a06.tar.gz | |
Fix test suite to work with current git
Reviewed-by: Dan Firth
Reviewed-by: Richard Maw
Diffstat (limited to 'tests.branching')
| -rw-r--r-- | tests.branching/foreach-handles-full-urls.stdout | 2 | ||||
| -rw-r--r-- | tests.branching/tag-works-with-multiple-morphs-repos.stdout | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests.branching/foreach-handles-full-urls.stdout b/tests.branching/foreach-handles-full-urls.stdout index 3abae62c..cee2f70a 100644 --- a/tests.branching/foreach-handles-full-urls.stdout +++ b/tests.branching/foreach-handles-full-urls.stdout @@ -1,4 +1,4 @@ file://TMP/morphs # On branch master -nothing to commit (working directory clean) +nothing to commit, working directory clean diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.stdout b/tests.branching/tag-works-with-multiple-morphs-repos.stdout index 938e41ff..934ab9ac 100644 --- a/tests.branching/tag-works-with-multiple-morphs-repos.stdout +++ b/tests.branching/tag-works-with-multiple-morphs-repos.stdout @@ -93,10 +93,10 @@ CommitDate: Tue Jul 31 16:51:54 2012 +0000 create tag --- - stratum1.morph | 9 ++++++--- - stratum2.morph | 14 ++++++++++++++ - stratum3.morph | 9 +++++++++ - test-system.morph | 9 ++++++--- + stratum1.morph | 9 ++++++--- + stratum2.morph | 14 ++++++++++++++ + stratum3.morph | 9 +++++++++ + test-system.morph | 9 ++++++--- 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/stratum1.morph b/stratum1.morph |