Remove conflict(8).

[nmh] / .gitignore

diff --git a/.gitignore b/.gitignore
index 743853bd5bf2af6b63d27bc9225d9260f30f0a44..e3335a9ba464ace313c8120bd951cea5a8f8f58e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -58,7 +58,6 @@ a.out.dSYM/
 /uip/ap
 /uip/burst
 /uip/comp
-/uip/conflict
 /uip/dist
 /uip/dp
 /uip/flist
@@ -79,6 +78,7 @@ a.out.dSYM/
 /uip/mhshow
 /uip/mhstore
 /uip/mhtest
+/uip/mkstemp
 /uip/msgchk
 /uip/msh
 /uip/new