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



diff --git a/.hgignore b/.hgignore
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
diff --git a/TODO b/TODO
diff --git a/contrib/patchbomb b/contrib/patchbomb
diff --git a/doc/hg.1.txt b/doc/hg.1.txt
diff --git a/mercurial/bdiff.c b/mercurial/bdiff.c
--- a/mercurial/bdiff.c
+++ b/mercurial/bdiff.c
@@ -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 --git a/mercurial/commands.py b/mercurial/commands.py
diff --git a/mercurial/hg.py b/mercurial/hg.py
diff --git a/mercurial/hgweb.py b/mercurial/hgweb.py
diff --git a/mercurial/revlog.py b/mercurial/revlog.py
diff --git a/mercurial/util.py b/mercurial/util.py
diff --git a/templates/map b/templates/map
diff --git a/tests/test-help b/tests/test-help
diff --git a/tests/test-help.out b/tests/test-help.out
diff --git a/tests/test-merge-revert.out b/tests/test-merge-revert.out
diff --git a/tests/test-merge-revert2 b/tests/test-merge-revert2
diff --git a/tests/test-merge-revert2.out b/tests/test-merge-revert2.out
diff --git a/tests/test-walk b/tests/test-walk
diff --git a/tests/test-walk.out b/tests/test-walk.out