Index: compare-digi.sh =================================================================== diff -u -rfb1896aa5079ca6afef9e3828e7d0d09ad087fca -r890278149eb9120d08729ad36fe64a6709bb7562 --- compare-digi.sh (.../compare-digi.sh) (revision fb1896aa5079ca6afef9e3828e7d0d09ad087fca) +++ compare-digi.sh (.../compare-digi.sh) (revision 890278149eb9120d08729ad36fe64a6709bb7562) @@ -6,7 +6,7 @@ err_nomanifest=2 # one commit before kirkstore. -# Digi has a habit of adding all the hashes then on next commit changes all to kirkstone and tag it. +# Digi has a habit of adding all the hashes then on next commit changes all to kirkstone and tag it. # But it seems that last kirkstone tag is not always working. commit="kirkstone~1" mainfolder="$(dirname "$0")" @@ -103,5 +103,5 @@ echo -e "$digimanifestmod" > "$digimanifest" # compare the two leahi and digi manifests. -# diff -u $manifest $digimanifest | cat -meld '$manifest' '$digimanifest' & +diff -u $manifest $digimanifest | cat +# meld '$manifest' '$digimanifest' & Index: default.xml =================================================================== diff -u -r31f9f969e4f5121199f5d18259ab1c117706739d -r890278149eb9120d08729ad36fe64a6709bb7562 --- default.xml (.../default.xml) (revision 31f9f969e4f5121199f5d18259ab1c117706739d) +++ default.xml (.../default.xml) (revision 890278149eb9120d08729ad36fe64a6709bb7562) @@ -5,33 +5,38 @@ - + - + - + + + + + - + - + - + - + - - + +