git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3c85452 9e8f8de)
Merge branch 'da/mergetool-tests'
authorJunio C Hamano <redacted>
Tue, 21 Oct 2014 20:28:14 +0000 (13:28 -0700)
committerJunio C Hamano <redacted>
Tue, 21 Oct 2014 20:28:14 +0000 (13:28 -0700)
commit64bff25f78da5ae2e64f0598df20370c45aad7ef
tree45d15eb4a53f156b36ba19afbf9238f2b982ff96tree | snapshot
parent3c85452bb0ad744f453bb6b8e8373483a8bfc590commit | diff
parent9e8f8dea46b52682b3fca67d8602c694c10013e1commit | diff
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
t/test-lib-functions.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT