diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-12-02 09:00:53 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-12-02 09:00:53 +0000 |
| commit | 0861a2054145b9558f108e0662b35061db2a19ec (patch) | |
| tree | b26d10ff748da883014af7cd428f660186b39bf3 /tests.branching | |
| parent | a06ebc0405235a3081c77c8db694c65d3ff3e81c (diff) | |
| parent | 81026592a953fcd0c90419ac5d01d25eefda2cba (diff) | |
| download | morph-0861a2054145b9558f108e0662b35061db2a19ec.tar.gz | |
Merge branch 'baserock/pedroalvarez/fix-tests'
Reviewed-by:
- Francisco Redondo Marchena
- James Thomas
Diffstat (limited to 'tests.branching')
| -rw-r--r-- | tests.branching/edit-clones-chunk.stdout | 4 | ||||
| -rw-r--r-- | tests.branching/foreach-handles-full-urls.stdout | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tests.branching/edit-clones-chunk.stdout b/tests.branching/edit-clones-chunk.stdout index d0bcb565..9a62092d 100644 --- a/tests.branching/edit-clones-chunk.stdout +++ b/tests.branching/edit-clones-chunk.stdout @@ -13,9 +13,7 @@ test:hello * remote origin Fetch URL: file://TMP/hello Push URL: file://TMP/hello - HEAD branch (remote HEAD is ambiguous, may be one of the following): - alfred - master + HEAD branch: master Remote branches: alfred tracked master tracked diff --git a/tests.branching/foreach-handles-full-urls.stdout b/tests.branching/foreach-handles-full-urls.stdout index cee2f70a..6b8728d0 100644 --- a/tests.branching/foreach-handles-full-urls.stdout +++ b/tests.branching/foreach-handles-full-urls.stdout @@ -1,4 +1,5 @@ file://TMP/morphs -# On branch master +On branch master +Your branch is up-to-date with 'origin/master'. nothing to commit, working directory clean |