Fix merge glitches, get it to build.

[wget] / .hgignore

diff --git a/.hgignore b/.hgignore
index bbeb997fb2f2e8ca46b7dfbaa002dc4d2094cf41..58932bb021bb5e5033d4894039138e4d3a3eae13 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -1,19 +1,25 @@
-
 # Automatically generated by `hgimportsvn`
 syntax:glob
 .svn
 **.orig
 aclocal.m4
-compile
 configure
 config.log
 **Makefile
 **Makefile.in
 config.status
-depcomp
+config.status.lineno
 autom4te.cache
-mdate-sh
-missing
+lib/.deps
+lib/*.o
+lib/libgnu.a
+lib/unistd.h
+lib/stdbool.h
+lib/stdint.h
+lib/wchar.h
+md5/.deps
+md5/*.o
+md5/libmd5.a
 tests/WgetTest.pm
 tests/unit-tests
 tests/*.o
@@ -22,10 +28,13 @@ src/.deps
 src/stamp-h1
 src/config.h
 src/config.h.in
+src/css.c
 src/wget
+src/cscope.out
 src/tags
 src/TAGS
 src/libunittest.a
+src/version.c
 doc/stamp-vti
 doc/wget.1
 doc/wget.pod
@@ -49,5 +58,12 @@ doc/version.texi
 po/POTFILES
 po/*.gmo
 po/wget.pot
+po/remove-potcdate.sed
+po/stamp-po
+po/en@boldquot.insert-header
+po/en@quot.insert-header
+util/trunc
+util/trunc.o
+util/.deps
 **~
 **.*.swp