Mercurial > hg > Applications > mh

diff uip/conflict.c @ 12:441a2190cfae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Lion fix
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Sat, 21 Apr 2012 13:10:49 +0900
parents bce86c4163a3
children 07f8972434be
line wrap: on
line diff
--- a/uip/conflict.c	Fri Nov 07 20:20:35 2008 +0000
+++ b/uip/conflict.c	Sat Apr 21 13:10:49 2012 +0900
@@ -1,12 +1,13 @@
 /* conflict.c - the new conflict */
 #ifndef	lint
-static char ident[] = "@(#)$Id$";
+static char ident[] = "@(#)$Id: conflict.c,v 1.1.1.1 2005/04/18 14:46:07 kono Exp $";
 #endif	/* lint */
 
 #include "../h/mh.h"
 #include "../h/aliasbr.h"
 #include "../h/local.h"
 #include <stdio.h>
+#include <unistd.h>
 #include "../zotnet/mts.h"
 #include <grp.h>
 #include <pwd.h>