diff options
Diffstat (limited to 'tests.merging/move-chunk-repo.script')
| -rwxr-xr-x | tests.merging/move-chunk-repo.script | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests.merging/move-chunk-repo.script b/tests.merging/move-chunk-repo.script index a203a824..7b96bc81 100755 --- a/tests.merging/move-chunk-repo.script +++ b/tests.merging/move-chunk-repo.script @@ -1,4 +1,5 @@ #!/bin/sh +# # Copyright (C) 2012 Codethink Limited # # This program is free software; you can redistribute it and/or modify @@ -14,8 +15,9 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# "morph merge" should detect changes in a repo that was added as part of the -# branch and warn the user that the changes will not be merged automatically + +## "morph merge" should detect changes in a repo that was added as part of the +## branch and warn the user that the changes will not be merged automatically set -eu |