/[cvs]/ccvs/contrib/clmerge.pl
ViewVC logotype

Diff of /ccvs/contrib/clmerge.pl

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.2 by dprice, Fri Jan 5 18:18:18 2001 UTC revision 1.3 by dprice, Thu Oct 6 20:25:12 2005 UTC
# Line 1  Line 1 
1  #! xPERL_PATHx  #! @PERL@
2    
3    # Copyright (C) 1995-2005 The Free Software Foundation, Inc.
4    
5    # This program is free software; you can redistribute it and/or modify
6    # it under the terms of the GNU General Public License as published by
7    # the Free Software Foundation; either version 2, or (at your option)
8    # any later version.
9    #
10    # This program is distributed in the hope that it will be useful,
11    # but WITHOUT ANY WARRANTY; without even the implied warranty of
12    # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13    # GNU General Public License for more details.
14    
15  # Merge conflicted ChangeLogs  # Merge conflicted ChangeLogs
16  # tromey Mon Aug 15 1994  # tromey Mon Aug 15 1994

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26