| commit | ee42545884552f2f782a2c2f091de8f07169b831 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Mon Apr 06 22:53:29 2009 +0000 |
| committer | Benjamin Peterson <benjamin@python.org> | Mon Apr 06 22:53:29 2009 +0000 |
| tree | 222d5df4c202b80773ed1e9be3265d287b1d0542 | |
| parent | a27e6e3d587881e501ef7de93f7a8a2afb5cbf00 [diff] [blame] |
see if this helps the doc builds
diff --git a/Misc/build.sh b/Misc/build.sh index 2a44ce1..3774487 100755 --- a/Misc/build.sh +++ b/Misc/build.sh
@@ -257,6 +257,7 @@ # which will definitely fail with a conflict. #CONFLICTED_FILE=commontex/boilerplate.tex #conflict_count=`grep -c "<<<" $CONFLICTED_FILE` +make clean conflict_count=0 if [ $conflict_count != 0 ]; then echo "Conflict detected in $CONFLICTED_FILE. Doc build skipped." > ../build/$F