# HG changeset patch
# User cl
# Date 1303957231 25200
# Node ID 3fd435635ca6acb68dd75818292a630fe7c2c204
# Parent  f4298bc3f4b6baa315643be06966f09684290068# Parent  8de6a58b06e934379ab19aa9d002aa8f6fa3397b
Merge

diff -r f4298bc3f4b6 -r 3fd435635ca6 hotspot/.hgignore
--- a/hotspot/.hgignore	Wed Jul 05 17:42:19 2017 +0200
+++ b/hotspot/.hgignore	Wed Apr 27 19:20:31 2011 -0700
@@ -5,3 +5,4 @@
 ^src/share/tools/IdealGraphVisualizer/[a-zA-Z0-9]*/build/
 ^src/share/tools/IdealGraphVisualizer/build/
 ^src/share/tools/IdealGraphVisualizer/dist/
+^.hgtip