diff options
| author |  Kirill Smelkov <kirr@mns.spb.ru> | 2014-02-03 13:08:49 +0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-02-24 14:44:57 -0800 |
| commit | fce135c4ffc87f85e1c3b5c57a6d9e1abdbd074d (patch) | |
| tree | 35aaad0184f3676d7468388ada66d8d4b7e96a19 /t/t6023-merge-file.sh | |
| parent | combine-diff: simplify intersect_paths() further (diff) | |
| download | tgif-fce135c4ffc87f85e1c3b5c57a6d9e1abdbd074d.tar.xz | |
tests: add checking that combine-diff emits only correct paths
where "correct paths" stands for paths that are different to all
parents.
Up until now, we were testing combined diff only on one file, or on
several files which were all different (t4038-diff-combined.sh).
As recent thinko in "simplify intersect_paths() further" showed, and
also, since we are going to rework code for finding paths different to
all parents, lets write at least basic tests.
Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6023-merge-file.sh')
0 files changed, 0 insertions, 0 deletions