summaryrefslogtreecommitdiff
path: root/t/t3311-notes-merge-fanout.sh
AgeCommit message (Collapse)AuthorFilesLines
2010-11-17git notes merge: Add testcases for merging notes trees at different fanoutsLibravatar Johan Herland1-0/+436
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>