X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=merge.h;h=3ec64f3ed98b824e5263e7b86b4e5eacec81a78b;hb=0f4971d043c38bae1bfb95201622a1405110f899;hp=208c39bd0477cd8ae312c755c4f7571191bf0a4c;hpb=6a721665f41611f80cb878237b5d7fa650ccbe20;p=onak.git

diff --git a/merge.h b/merge.h
index 208c39b..3ec64f3 100644
--- a/merge.h
+++ b/merge.h
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
+ *
+ * $Id: merge.h,v 1.5 2003/06/04 20:57:11 noodles Exp $
  */
 
 #ifndef __MERGE_H__