diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-07 05:42:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-10 12:55:51 -0700 |
| commit | ea4b52a86f6b6b8e5aef8e47fb557f37422512bf (patch) | |
| tree | 31aa071b56a37a864ca6ed563cb785b53e962b4b /usage.c | |
| parent | 8ff21b1a3307c7059ea1e00b5117a50a2bc5fec8 (diff) | |
| download | git-ea4b52a86f6b6b8e5aef8e47fb557f37422512bf.tar.gz git-ea4b52a86f6b6b8e5aef8e47fb557f37422512bf.tar.xz | |
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 'usage.c')
0 files changed, 0 insertions, 0 deletions