projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Remove CVS Id tags.
[onak.git]
/
merge.c
diff --git
a/merge.c
b/merge.c
index c51474c753bd06b0866878d284159771e4cdcebe..18882e92b92251f7c3f83f75938117f20a579857 100644
(file)
--- a/
merge.c
+++ b/
merge.c
@@
-4,8
+4,6
@@
* Jonathan McDowell <noodles@earth.li>
*
* Copyright 2002 Project Purple
- *
- * $Id: merge.c,v 1.11 2003/06/07 13:45:35 noodles Exp $
*/
#include <assert.h>