X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/2f1b865faa5a6fbd809caa7c70f9b4dddfa35947..6105d01bd446c4a27638e90ff8fd539e093b3ea2:/merge.c

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>