X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=merge.c;fp=merge.c;h=6ed0a2d139a40af796251862a7cb624f4fc6deeb;hb=0f4971d043c38bae1bfb95201622a1405110f899;hp=33924f05e3078b886a94afb702b4e331b9a9f51f;hpb=6a721665f41611f80cb878237b5d7fa650ccbe20;p=onak.git

diff --git a/merge.c b/merge.c
index 33924f0..6ed0a2d 100644
--- a/merge.c
+++ b/merge.c
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
+ *
+ * $Id: merge.c,v 1.10 2003/06/04 20:57:11 noodles Exp $
  */
 
 #include <assert.h>