summaryrefslogtreecommitdiff
path: root/Documentation/.gitattributes
diff options
context:
space:
mode:
authorJohan Herland <johan@herland.net>2010-11-09 21:49:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-17 21:23:55 (GMT)
commit305ddd444ee66607581c014b371ed74af534eca5 (patch)
tree08c6496482d895f43984adfb6b2bc20af9f90ef9 /Documentation/.gitattributes
parenta6a09095a08339afc8468d053ff978ed4662a1d5 (diff)
downloadgit-305ddd444ee66607581c014b371ed74af534eca5.zip
git-305ddd444ee66607581c014b371ed74af534eca5.tar.gz
git-305ddd444ee66607581c014b371ed74af534eca5.tar.bz2
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 'Documentation/.gitattributes')
0 files changed, 0 insertions, 0 deletions