git.samba.org
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Preparing for release of 3.2.4pre1
[rsync.git]
/
testsuite
/
merge.test
diff --git
a/testsuite/merge.test
b/testsuite/merge.test
index 5f9a6da6631845926a3e3a4fa0291b2c85588142..7fccc40dbbc73158c6e80afc2274156df6b6e8b6 100644
(file)
--- a/
testsuite/merge.test
+++ b/
testsuite/merge.test
@@
-1,6
+1,6
@@
#!/bin/sh
-# Copyright (C) 2004-202
0
Wayne Davison
+# Copyright (C) 2004-202
1
Wayne Davison
# This program is distributable under the terms of the GNU GPL (see
# COPYING).