Tidy up command tests

Be consistent about placement of test description, blank lines, etc.

9 files changed, 37 insertions, 20 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
 
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
 
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
 
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
 
diff --git a/tests.merging/from-branch-not-checked-out.script b/tests.merging/from-branch-not-checked-out.script
index a4661622..e51af791 100755
--- a/tests.merging/from-branch-not-checked-out.script
+++ b/tests.merging/from-branch-not-checked-out.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,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-# Handle 'from' branch not being checked out
+
+## Handle 'from' branch not being checked out
 
 set -eu
 
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
 
diff --git a/tests.merging/rename-chunk.script b/tests.merging/rename-chunk.script
index a50a83bd..ef4c96a2 100755
--- a/tests.merging/rename-chunk.script
+++ b/tests.merging/rename-chunk.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 pull changes from a chunk even if its name was changed
-# in the branch
+
+## "morph merge" should pull changes from a chunk even if its name was changed
+## in the branch
 
 set -eu
 
diff --git a/tests.merging/rename-stratum.script b/tests.merging/rename-stratum.script
index b0e5d57e..c5c92823 100755
--- a/tests.merging/rename-stratum.script
+++ b/tests.merging/rename-stratum.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 deal with stratum renames; currently it doesn't deal
-# very well, but at least we don't crash.
+
+## "morph merge" should deal with stratum renames; currently it doesn't deal
+## very well, but at least we don't crash.
 
 set -eu
 
diff --git a/tests.merging/warn-if-merging-petrified-morphologies.script b/tests.merging/warn-if-merging-petrified-morphologies.script
index a81c0237..5753786c 100755
--- a/tests.merging/warn-if-merging-petrified-morphologies.script
+++ b/tests.merging/warn-if-merging-petrified-morphologies.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.
 
-# If the user merges a petrified branch into an unpetrified branch,
-# we should warn them.
+
+## If the user merges a petrified branch into an unpetrified branch,
+## we should warn them.
 
 set -eu