Remove conflict(8).

[nmh] / .gitignore

diff --git a/.gitignore b/.gitignore
index af04fac2f15bd4b796ac7dee3f728523e509452f..e3335a9ba464ace313c8120bd951cea5a8f8f58e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,8 @@
 /RPM/
 a.out.dSYM/
 /config/version.c
 /RPM/
 a.out.dSYM/
 /config/version.c

+/etc/gen-ctype-checked
+/etc/gen-ctype-checked.exe

 /etc/mhn.defaults
 /etc/mts.conf
 /man/*.[1578]
 /etc/mhn.defaults
 /etc/mts.conf
 /man/*.[1578]


@@ -48,6 +50,7 @@ a.out.dSYM/
 /man/mh-chart.man
 /mts/libmts.a
 /sbr/*.a
 /man/mh-chart.man
 /mts/libmts.a
 /sbr/*.a

+/sbr/ctype-checked.*

 /sbr/sigmsg.h
 /test/testdir/
 /uip/ali
 /sbr/sigmsg.h
 /test/testdir/
 /uip/ali


@@ -55,17 +58,18 @@ a.out.dSYM/
 /uip/ap
 /uip/burst
 /uip/comp
 /uip/ap
 /uip/burst
 /uip/comp

-/uip/conflict

 /uip/dist
 /uip/dp
 /uip/flist
 /uip/fmtdump
 /uip/dist
 /uip/dp
 /uip/flist
 /uip/fmtdump

+/uip/fmttest

 /uip/folder
 /uip/forw
 /uip/inc
 /uip/install-mh
 /uip/mark
 /uip/mhbuild
 /uip/folder
 /uip/forw
 /uip/inc
 /uip/install-mh
 /uip/mark
 /uip/mhbuild

+/uip/mhfixmsg

 /uip/mhl
 /uip/mhlist
 /uip/mhn
 /uip/mhl
 /uip/mhlist
 /uip/mhn


@@ -74,6 +78,7 @@ a.out.dSYM/
 /uip/mhshow
 /uip/mhstore
 /uip/mhtest
 /uip/mhshow
 /uip/mhstore
 /uip/mhtest

+/uip/mkstemp

 /uip/msgchk
 /uip/msh
 /uip/new
 /uip/msgchk
 /uip/msh
 /uip/new


@@ -99,11 +104,12 @@ a.out.dSYM/
 /uip/whatnow
 /uip/whom
 /uip/*.exe
 /uip/whatnow
 /uip/whom
 /uip/*.exe

-/test/fakesmtp

 /test/fakepop
 /test/fakepop

-/test/getfullname
-/test/getfqdn
+/test/fakesmtp
+/test/getcanon

 /test/getcwidth
 /test/getcwidth

+/test/getfullname
+/test/*.exe

 
 # Removed by mostlyclean:
 *.o
 
 # Removed by mostlyclean:
 *.o