path: root/merge.c
diff options
authorGuy Harris <guy@alum.mit.edu>2004-07-18 00:24:25 +0000
committerGuy Harris <guy@alum.mit.edu>2004-07-18 00:24:25 +0000
commit8a8b8834500043ea4f7d818aafa2b1edb353563a (patch)
treeb927867e72fe395b5060acacc1f9e827b3e430cd /merge.c
parent16c252d77519048fbea9fee2e00f5ea66d534953 (diff)
Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows; hopefully this means that if a CR/LF version is checked in on Windows, the CRs will be stripped so that they show up only when checked out on Windows, not on UN*X. svn path=/trunk/; revision=11400
Diffstat (limited to 'merge.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/merge.c b/merge.c
index 33a12e1637..ac46050042 100644
--- a/merge.c
+++ b/merge.c
@@ -1,6 +1,6 @@
/* Combine two dump files, either by appending or by merging by timestamp
- * $Id: merge.c,v 1.6 2004/06/29 20:59:23 ulfl Exp $
+ * $Id$
* Written by Scott Renfro <scott@renfro.org> based on
* editcap by Richard Sharpe and Guy Harris