Fix merge glitches, get it to build.

[wget] / .hgignore

diff --git a/.hgignore b/.hgignore
index 3832d65e6c8392cfd55557c350f21d828df58fa9..58932bb021bb5e5033d4894039138e4d3a3eae13 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -28,6 +28,7 @@ src/.deps
 src/stamp-h1
 src/config.h
 src/config.h.in
+src/css.c
 src/wget
 src/cscope.out
 src/tags
@@ -61,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