Skip to content

Commit

Permalink
Merge branch 'da/mergetool-tests'
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
Junio C Hamano committed Oct 21, 2014
2 parents 3c85452 + 9e8f8de commit 64bff25
Show file tree
Hide file tree
Showing 2 changed files with 469 additions and 471 deletions.
Loading

0 comments on commit 64bff25

Please sign in to comment.