From ce095facb60fab0124d4dbed58fa59110c04ce92 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Sun, 13 Jan 2013 23:02:00 +0000
Subject: Manual update to last merge SHA

---
 misc/merge-ioq3-into-trem.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'misc/merge-ioq3-into-trem.sh')

diff --git a/misc/merge-ioq3-into-trem.sh b/misc/merge-ioq3-into-trem.sh
index 53f6a1d6..c943a03e 100755
--- a/misc/merge-ioq3-into-trem.sh
+++ b/misc/merge-ioq3-into-trem.sh
@@ -1,5 +1,5 @@
 #! /bin/bash
-# TODO Consider rewrite in perl/python to make this a but less crappy
+# TODO Consider rewrite in perl/python to make this a bit less crappy
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PATCHES_DIR=${DIR}/patches
@@ -56,7 +56,7 @@ then
     read -p "Confirm resolve? "
     git am --resolved
   fi
-  
+
   if [ "$?" -ne 0 ]
   then
     echo "Patch failed to apply."
@@ -76,7 +76,7 @@ then
     echo "Processing ${SHA} ${PATCH}..."
     cat ${PATCH} | sed -e 's/\([ab]\)\/code\//\1\/src\//g' | \
       git am ${EXCLUDE_PARAMETERS} --quiet --3way
-    
+
     if [ "$?" -ne 0 ]
     then
       echo "Patch failed to apply."
-- 
cgit