Fix merge glitches, get it to build.

[wget] / .hgignore

diff --git a/.hgignore b/.hgignore
index 27a90f5e3b877dd64c0f980aab6052bbda9bd6ab..58932bb021bb5e5033d4894039138e4d3a3eae13 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -28,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
@@ -60,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