diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-03-26 15:15:25 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-03-26 15:15:25 +0100 |
| commit | ca7900299dc32c7b59e896f5f4b9a38978f226a0 (patch) | |
| tree | d1f15db7c51c83c1eb1fa11565adc2a295c48eec /tests.branching/edit-checkouts-existing-chunk.stdout | |
| parent | 7d7d597afd0a562916f106d259f4ff78383f9631 (diff) | |
| parent | 9e18d7cc163ab95524349567fc8c4205cd0f11ce (diff) | |
| download | morph-ca7900299dc32c7b59e896f5f4b9a38978f226a0.tar.gz | |
Add rudimentary branch+merge support
Diffstat (limited to 'tests.branching/edit-checkouts-existing-chunk.stdout')
| -rw-r--r-- | tests.branching/edit-checkouts-existing-chunk.stdout | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests.branching/edit-checkouts-existing-chunk.stdout b/tests.branching/edit-checkouts-existing-chunk.stdout new file mode 100644 index 00000000..a06832c2 --- /dev/null +++ b/tests.branching/edit-checkouts-existing-chunk.stdout @@ -0,0 +1,7 @@ +Current branches, morphs: +* master +Current branches, hello: +* alfred + master +Files in hello: +hello.chunk |