From 46cb042952da4a184ac84540c81bbf0ee9d8e793 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Sat, 16 Feb 2013 22:13:47 +0000
Subject: Add merge data to .gitignore

---
 .gitignore                   | 2 ++
 misc/merge-ioq3-into-trem.sh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index bfd2d925..83e0b02d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ build
 Makefile.local
 *.swp
 *tags
+misc/patches
+misc/last-merged-ioq3-revision.temp
diff --git a/misc/merge-ioq3-into-trem.sh b/misc/merge-ioq3-into-trem.sh
index 8a4617b4..7bf0a319 100755
--- a/misc/merge-ioq3-into-trem.sh
+++ b/misc/merge-ioq3-into-trem.sh
@@ -101,7 +101,7 @@ fi
 # Finished merging so update the last revision marker
 if [ -f ${LAST_REVISION_TEMP_FILE} ]
 then
-  diff ${LAST_REVISION_FILE} ${LAST_REVISION_TEMP_FILE} 2> /dev/null
+  diff ${LAST_REVISION_FILE} ${LAST_REVISION_TEMP_FILE} &> /dev/null
   if [ "$?" -ne 0 ]
   then
     mv ${LAST_REVISION_TEMP_FILE} ${LAST_REVISION_FILE}
-- 
cgit