| commit | 64bff25f78da5ae2e64f0598df20370c45aad7ef | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Oct 2014 20:28:14 +0000 (21 13:28 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 Oct 2014 20:28:14 +0000 (21 13:28 -0700) | ||
| tree | 45d15eb4a53f156b36ba19afbf9238f2b982ff96 | treesnapshot (tar.gz zip) |
| parent | 3c85452bb0ad744f453bb6b8e8373483a8bfc590 | commitdiff |
| parent | 9e8f8dea46b52682b3fca67d8602c694c10013e1 | commitdiff |
Merge branch 'da/mergetool-tests'
The clean-up of this test script was long overdue and is a very
welcome change.
* da/mergetool-tests:
test-lib-functions: adjust style to match CodingGuidelines
t7610-mergetool: use test_config to isolate tests
t7610-mergetool: add missing && and remove commented-out code
t7610-mergetool: use tabs instead of a mix of tabs and spaces
The clean-up of this test script was long overdue and is a very
welcome change.
* da/mergetool-tests:
test-lib-functions: adjust style to match CodingGuidelines
t7610-mergetool: use test_config to isolate tests
t7610-mergetool: add missing && and remove commented-out code
t7610-mergetool: use tabs instead of a mix of tabs and spaces
| t/test-lib-functions.sh | diff1 | diff2 | blobhistory |