summaryrefslogtreecommitdiff
path: root/t/t1000-read-tree-m-3way.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-07 12:42:01 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-10 19:55:51 (GMT)
commitea4b52a86f6b6b8e5aef8e47fb557f37422512bf (patch)
tree31aa071b56a37a864ca6ed563cb785b53e962b4b /t/t1000-read-tree-m-3way.sh
parent8ff21b1a3307c7059ea1e00b5117a50a2bc5fec8 (diff)
downloadgit-ea4b52a86f6b6b8e5aef8e47fb557f37422512bf.zip
git-ea4b52a86f6b6b8e5aef8e47fb557f37422512bf.tar.gz
git-ea4b52a86f6b6b8e5aef8e47fb557f37422512bf.tar.bz2
t1000: fix case table.
Case #10 is not handled with unpack-trees.c:threeway_merge() internally, unless under the agressive rule, and it is not a bug. As the test expects, ND (one side did not do anything, other side deleted) case was meant to be handled by the caller's policy (e.g. git-merge-one-file or git-merge-recursive). Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t1000-read-tree-m-3way.sh')
-rwxr-xr-xt/t1000-read-tree-m-3way.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1000-read-tree-m-3way.sh b/t/t1000-read-tree-m-3way.sh
index e26a36c..de4e5eb 100755
--- a/t/t1000-read-tree-m-3way.sh
+++ b/t/t1000-read-tree-m-3way.sh
@@ -184,7 +184,7 @@ checked.
9 exists O!=A missing no merge must match A and be
up-to-date, if exists.
------------------------------------------------------------------
- 10 exists O==A missing remove ditto
+ 10 exists O==A missing no merge must match A
------------------------------------------------------------------
11 exists O!=A O!=B no merge must match A and be
A!=B up-to-date, if exists.