projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
cscvs to tla changeset 77
[onak.git]
/
merge.h
diff --git
a/merge.h
b/merge.h
index 208c39bd0477cd8ae312c755c4f7571191bf0a4c..3ec64f3ed98b824e5263e7b86b4e5eacec81a78b 100644
(file)
--- 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__