summaryrefslogtreecommitdiff
path: root/t/t4009-diff-rename-4.sh
diff options
context:
space:
mode:
authorLibravatar Linus Torvalds <torvalds@ppc970.osdl.org>2005-06-05 15:31:52 -0700
committerLibravatar Linus Torvalds <torvalds@ppc970.osdl.org>2005-06-05 15:31:52 -0700
commitdc93841715dfa9a9cdda6f2c4a25eec831ea7aa0 (patch)
tree5e1c39a01feb2364f97f2c0c72e4a5870af9a69d /t/t4009-diff-rename-4.sh
parentgit-apply: consider it an error to apply no changes (diff)
downloadtgif-dc93841715dfa9a9cdda6f2c4a25eec831ea7aa0.tar.xz
diff 'rename' format change.
Clearly even Junio felt git "rename" header lines should say "from/to" instead of "old/new", since he wrote the documentation that way. This way it also matches "copy". git-apply will accept both versions, at least for a while.
Diffstat (limited to 't/t4009-diff-rename-4.sh')
-rw-r--r--t/t4009-diff-rename-4.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4009-diff-rename-4.sh b/t/t4009-diff-rename-4.sh
index 7d8ca6dc35..318915f447 100644
--- a/t/t4009-diff-rename-4.sh
+++ b/t/t4009-diff-rename-4.sh
@@ -57,8 +57,8 @@ copy to COPYING.1
- HOWEVER, in order to allow a migration to GPLv3 if that seems like
+ However, in order to allow a migration to GPLv3 if that seems like
diff --git a/COPYING b/COPYING.2
-rename old COPYING
-rename new COPYING.2
+rename from COPYING
+rename to COPYING.2
--- a/COPYING
+++ b/COPYING.2
@@ -2 +2 @@