X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=nogit;h=68420025c8dea9e6457e518c3b2b7bc4a01a93b4;hb=5834bcd7aebd13aa85167932053a535126de3fcb;hp=d55124d27d95ea92dcaa65d2475ab2f5c36f7e77;hpb=cadb0b69b70347408a653048b0c3687399f7650f;p=nogit

diff --git a/nogit b/nogit
index d55124d..6842002 100755
--- a/nogit
+++ b/nogit
@@ -64,7 +64,7 @@ nogit_clone()
     fi
 
     if [ -e $NOGIT_DIR_TMP ]; then
-        echo "Error: $NOGIT_DIR_TMP already exists. Was a previosu clone interrupted?"
+        echo "Error: $NOGIT_DIR_TMP already exists. Was a previous clone interrupted?"
         echo "You'll want to clean that up before trying again."
         return 1
     fi
@@ -97,6 +97,12 @@ nogit_clone()
         false
     fi
 
+    # Install the info/atttributes file that forces the "union" merge
+    # driver for all files, giving us the semantics of "keep both sides
+    # of all conflicts" that is at the heart of nogit.
+    mkdir -p tmp/.git/info
+    echo '* merge=union' > tmp/.git/info/attributes
+
     # Now that we've passed the sanity check, install the cloned .git
     # object store into $NOGIT_DIR, cleanup our temporary files, and
     # checkout the (known to not be conflicting) files.