Fix merge glitches, get it to build.

[wget] / .hgignore

diff --git a/.hgignore b/.hgignore
index 3922d274fdc6d144b7be703934fe7272fb44f1f3..58932bb021bb5e5033d4894039138e4d3a3eae13 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -1,4 +1,3 @@
-
 # Automatically generated by `hgimportsvn`
 syntax:glob
 .svn
@@ -18,6 +17,9 @@ 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
@@ -26,7 +28,9 @@ 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
@@ -58,5 +62,8 @@ 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