diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | misc/merge-ioq3-into-trem.sh | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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} |