]> git.ipfire.org Git - thirdparty/git.git/commit - unpack-trees.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8ff21b1) | patch
t1000: fix case table.
authorJunio C Hamano <junkio@cox.net>
Sat, 7 Apr 2007 12:42:01 +0000 (05:42 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 10 Apr 2007 19:55:51 +0000 (12:55 -0700)
commitea4b52a86f6b6b8e5aef8e47fb557f37422512bf
tree31aa071b56a37a864ca6ed563cb785b53e962b4btree | snapshot
parent8ff21b1a3307c7059ea1e00b5117a50a2bc5fec8commit | diff
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>
t/t1000-read-tree-m-3way.sh diff | blob | blame | history
unpack-trees.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.