Merge branch 'da/mergetool-tests'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Oct 2014 20:28:14 +0000 (13:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Oct 2014 20:28:14 +0000 (13:28 -0700)
commit64bff25...78da5ae2e64f0598df20370c45aad7ef
tree45d15eb...a53f156b36ba19afbf9238f2b982ff96copy hash to clipboard (tree)
parent3c85452...b0ad744f453bb6b8e8373483a8bfc590copy hash to clipboard (diff)
parent9e8f8de...46b52682b3fca67d8602c694c10013e1copy hash to clipboard (diff)
t/test-lib-functions.sh