diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-14 16:51:48 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-14 17:02:58 +0000 |
commit | 70564c6457b732e1dd35384971da5df3c5a1665b (patch) | |
tree | fec929625b46df3eca62f4f316bef90f6128c51a /tests.merging/conflict-stratum-field-ordering.script | |
parent | 4a2b2aa38b85971b72c925eea5ca18767c63cc50 (diff) | |
download | morph-70564c6457b732e1dd35384971da5df3c5a1665b.tar.gz |
Tidy up command tests
Be consistent about placement of test description, blank lines, etc.
Diffstat (limited to 'tests.merging/conflict-stratum-field-ordering.script')
-rwxr-xr-x | tests.merging/conflict-stratum-field-ordering.script | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests.merging/conflict-stratum-field-ordering.script b/tests.merging/conflict-stratum-field-ordering.script index 13ddf3fb..f5bfb4b8 100755 --- a/tests.merging/conflict-stratum-field-ordering.script +++ b/tests.merging/conflict-stratum-field-ordering.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,13 +15,14 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Conflict caused by two equivalent strata having different order in two -# different branches -# Morph should possibly resolve this conflict automatically in the future, -# because the meaning of the morphologies is unambiguious if not the -# contents. It depends on how much weight we give to the sort order of -# the morphology from a developer's point of view. +## Conflict caused by two equivalent strata having different order in two +## different branches + +## Morph should possibly resolve this conflict automatically in the future, +## because the meaning of the morphologies is unambiguious if not the +## contents. It depends on how much weight we give to the sort order of +## the morphology from a developer's point of view. set -eu |