diff options
Diffstat (limited to 'tests.merging/basic.script')
| -rwxr-xr-x | tests.merging/basic.script | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests.merging/basic.script b/tests.merging/basic.script index 8eddcfdb..0dbc2367 100755 --- a/tests.merging/basic.script +++ b/tests.merging/basic.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. -# Check that "morph merge" merges a system branch into a newly created -# system branch + +## Check that "morph merge" merges a system branch into a newly created +## system branch set -eu |