Changed ordering of changesets in make-conflicts_hg.sh to actually match

make-conflicts.sh.

Author: Harald Klimach

_utils/make-conflicts_hg.sh

@@ -20,34 +20,33 @@ hg bookmark master
 hg commit -m 'Commit One'
 
 cat << EOF > poem.txt
-twas brillig, and the slithy toves
+'Twas brillig, and the slithy toves
 Did gyre and gimble in the wabe:
-all mimsy were the borogoves,
-And the mome raths outgrabe.
+All mimsy were the borogroves
+And the mome raths outgabe.
 
 "Beware the Jabberwock, my son!
 The jaws that bite, the claws that catch!
-Beware the Jubjub bird, and shun
-The frumious Bandersnatch!"
+Beware the Jub jub bird, and shun
+The frumious bandersnatch!"
 EOF
 
 hg bookmark branchA
-hg commit -m 'Fix syntax mistakes'
+hg commit -m 'Buncha fixes'
 
-hg update -Cr master
 
+hg update -Cr master
 cat << EOF > poem.txt
-'Twas brillig, and the slithy toves
+twas brillig, and the slithy toves
 Did gyre and gimble in the wabe:
-All mimsy were the borogroves
-And the mome raths outgabe.
+all mimsy were the borogoves,
+And the mome raths outgrabe.
 
 "Beware the Jabberwock, my son!
 The jaws that bite, the claws that catch!
-Beware the Jub jub bird, and shun
-The frumious bandersnatch!"
+Beware the Jubjub bird, and shun
+The frumious Bandersnatch!"
 EOF
-
-hg commit -m 'Buncha fixes'
+hg commit -m 'Fix syntax mistakes'
 
 hg --config ui.merge=internal:merge merge branchA