diff options
Diffstat (limited to 'tests.merging/conflict-chunks.script')
| -rwxr-xr-x | tests.merging/conflict-chunks.script | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests.merging/conflict-chunks.script b/tests.merging/conflict-chunks.script index 37ee4fb8..e5f6618d 100755 --- a/tests.merging/conflict-chunks.script +++ b/tests.merging/conflict-chunks.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. -# When conflicts occur outside the root morphs repository, 'morph merge' -# should keep going until the end and report the list of failed repos. + +## When conflicts occur outside the root morphs repository, 'morph merge' +## should keep going until the end and report the list of failed repos. set -eu |