From 54a6001db1b240e1ac4defc281adfa9334474e73 Mon Sep 17 00:00:00 2001
From: Eleanor Saitta <ella@dymaxion.org>
Date: Tue, 8 Dec 2015 17:17:07 +0000
Subject: [PATCH] Saving files before refreshing line endings

---
 mount_image.sh |  2 +-
 tests/run.sh   | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/mount_image.sh b/mount_image.sh
index a5f4978..ada028b 100755
--- a/mount_image.sh
+++ b/mount_image.sh
@@ -35,7 +35,7 @@ PARTITION_BOOT='/dev/mmcblk0p1'
 
 # If you use the img
 ##### Debian
-IMAGE='2015-11-06-CIRCLean.img'
+IMAGE='raspbian-wheezy.img'
 OFFSET_ROOTFS=$((122880 * 512))
 OFFSET_BOOT=$((8192 * 512))
 ##### Arch
diff --git a/tests/run.sh b/tests/run.sh
index 5c1ba43..57762fe 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -2,6 +2,25 @@
 
 # http://pub.phyks.me/respawn/mypersonaldata/public/2014-05-20-11-08-01/
 
+<<<<<<< HEAD
+# To make debugging easier
+echo "KittenGroomer: in tests/run.sh" 1>&2
+
+if [ -z "$1" ]; then
+    echo "Please tell me which partition type to test."
+    echo "VFAT_NORM VFAT_PART NTPS_NORM EXT2 EXT3 EXT4"
+    exit
+fi
+if [ -z "$2" ]; then
+    echo "Please tell me which file type to test."
+    echo "t_images1"
+    exit
+fi
+TEST_PART_TYPE=${1}
+TEST_SOURCE_TYPE=${2}
+
+=======
+>>>>>>> master
 IMAGE='../raspbian-wheezy.img'
 OFFSET_ROOTFS=$((122880 * 512))