Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Fix typo in test comment.
author
Junio C Hamano
<junkio@cox.net>
Sat, 17 Sep 2005 06:27:52 +0000
(23:27 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Sat, 17 Sep 2005 18:57:50 +0000
(11:57 -0700)
I do not know why it was spelled git-rev-tree when I meant to say
git-read-tree, but the typo was left since day one.
Signed-off-by: Junio C Hamano <junkio@cox.net>
t/t1001-read-tree-m-2way.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
5a90d4a
)
diff --git
a/t/t1001-read-tree-m-2way.sh
b/t/t1001-read-tree-m-2way.sh
index 5b69681c520afc3f4838dc0540637260fa9f20fc..d0ed24275e593e0decd2cdaf46617d5c3fc876e3 100755
(executable)
--- a/
t/t1001-read-tree-m-2way.sh
+++ b/
t/t1001-read-tree-m-2way.sh
@@
-11,7
+11,7
@@
There is the head (called H) and another commit (called M), which is
simply ahead of H. The index and the work tree contains a state that
is derived from H, but may also have local changes. This test checks
all the combinations described in the two-tree merge "carry forward"
-rules, found in <Documentation/git-re
v
-tree.txt>.
+rules, found in <Documentation/git-re
ad
-tree.txt>.
In the test, these paths are used:
bozbar - in H, stays in M, modified from bozbar to gnusto