summaryrefslogtreecommitdiff
path: root/check_bindir
diff options
context:
space:
mode:
authorLibravatar Johan Herland <johan@herland.net>2010-11-09 22:49:56 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-11-17 13:23:55 -0800
commit305ddd444ee66607581c014b371ed74af534eca5 (patch)
tree08c6496482d895f43984adfb6b2bc20af9f90ef9 /check_bindir
parentgit notes merge: Add another auto-resolving strategy: "cat_sort_uniq" (diff)
downloadtgif-305ddd444ee66607581c014b371ed74af534eca5.tar.xz
git notes merge: Add testcases for merging notes trees at different fanouts
Notes trees may exist at different fanout levels internally. This implementation detail should not be visible to the user, and it should certainly not affect the merging of notes tree. This patch adds testcases verifying the correctness of 'git notes merge' when merging notes trees at different fanout levels. This patch has been improved by the following contributions: - Junio C Hamano: Portability: Don't string-compare 'wc -l' output Thanks-to: Junio C Hamano <gitster@pobox.com> Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'check_bindir')
0 files changed, 0 insertions, 0 deletions