diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-03-10 11:31:45 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-03-10 11:31:45 +0000 |
| commit | 444ba7c2f0f3d53753abeff6dfd33681279a3d84 (patch) | |
| tree | afdd012aa6d6001731e91dd863c9dbc45919d767 /tests.branching/edit-checkouts-existing-chunk.script | |
| parent | 356e5f60268b154a5aa09b4fbcd716d908262b56 (diff) | |
| parent | 2c4752d71d35ec31221dcdab1289d2084936ccae (diff) | |
| download | morph-444ba7c2f0f3d53753abeff6dfd33681279a3d84.tar.gz | |
Merge branch 'liw/fix-check-2-rebase'
Reviewed-by: Daniel Silverstone
Reviewed-by: Richard Maw
Diffstat (limited to 'tests.branching/edit-checkouts-existing-chunk.script')
| -rwxr-xr-x | tests.branching/edit-checkouts-existing-chunk.script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests.branching/edit-checkouts-existing-chunk.script b/tests.branching/edit-checkouts-existing-chunk.script index 9e66ceb0..c8fb9312 100755 --- a/tests.branching/edit-checkouts-existing-chunk.script +++ b/tests.branching/edit-checkouts-existing-chunk.script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2012-2013 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -34,4 +34,4 @@ echo "Current branches:" echo echo "Files in hello:" -ls "$DATADIR/workspace/alfred/test:hello" +ls "$DATADIR/workspace/alfred/test/hello" |