diff options
| author | Tim Angus <tim@ngus.net> | 2013-02-16 22:13:47 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-02-16 22:13:47 +0000 |
| commit | 46cb042952da4a184ac84540c81bbf0ee9d8e793 (patch) | |
| tree | 2a70300911e4ff3b4f981f858ef7274b2694bb0d | |
| parent | 3e7f87fa4ad043df179a09b7f48f141586d2a816 (diff) | |
Add merge data to .gitignore
| -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} |