diff options
Diffstat (limited to 'tests.merging/conflict-morphology-kind.script')
-rwxr-xr-x | tests.merging/conflict-morphology-kind.script | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests.merging/conflict-morphology-kind.script b/tests.merging/conflict-morphology-kind.script index 235d8130..ca8403b8 100755 --- a/tests.merging/conflict-morphology-kind.script +++ b/tests.merging/conflict-morphology-kind.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,7 +15,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# If morphology kind differs between branches, it's a merge conflict +## If morphology kind differs between branches, it's a merge conflict set -eu |