# HG changeset patch
# User mpm@selenic.com
# Date 1123991022 28800
# Node ID 01215ad0428341bf0b5806b199c54fe158d9affd
# Parent  0cd2ee61b10a03992daabee417949866318c308b# Parent  77b52b864249768a0ec615af331be778fdbb65e9
Merge with BOS



diff -r 77b52b864249 -r 01215ad04283 .hgignore
diff -r 77b52b864249 -r 01215ad04283 CONTRIBUTORS
diff -r 77b52b864249 -r 01215ad04283 TODO
diff -r 77b52b864249 -r 01215ad04283 contrib/patchbomb
diff -r 77b52b864249 -r 01215ad04283 doc/hg.1.txt
diff -r 77b52b864249 -r 01215ad04283 mercurial/bdiff.c
--- a/mercurial/bdiff.c	Sat Aug 13 15:26:32 2005 -0800
+++ b/mercurial/bdiff.c	Sat Aug 13 19:43:42 2005 -0800
@@ -12,6 +12,11 @@
 #include <Python.h>
 #include <stdlib.h>
 #include <string.h>
+
+#ifdef __hpux
+#define inline
+#endif
+
 #ifdef _WIN32
 #ifdef _MSC_VER
 #define inline __inline
diff -r 77b52b864249 -r 01215ad04283 mercurial/commands.py
diff -r 77b52b864249 -r 01215ad04283 mercurial/hg.py
diff -r 77b52b864249 -r 01215ad04283 mercurial/hgweb.py
diff -r 77b52b864249 -r 01215ad04283 mercurial/revlog.py
diff -r 77b52b864249 -r 01215ad04283 mercurial/util.py
diff -r 77b52b864249 -r 01215ad04283 templates/map
diff -r 77b52b864249 -r 01215ad04283 tests/test-help
diff -r 77b52b864249 -r 01215ad04283 tests/test-help.out
diff -r 77b52b864249 -r 01215ad04283 tests/test-merge-revert.out
diff -r 77b52b864249 -r 01215ad04283 tests/test-merge-revert2
diff -r 77b52b864249 -r 01215ad04283 tests/test-merge-revert2.out
diff -r 77b52b864249 -r 01215ad04283 tests/test-walk
diff -r 77b52b864249 -r 01215ad04283 tests/test-walk.out