Merge branch 'en/merge-recursive-tests'

Browse Source

Clean up tests in t6xxx series about 'merge' command.

* en/merge-recursive-tests:
  t6036: prefer test_when_finished to manual cleanup in following test
  t6036, t6042: prefer test_cmp to sequences of test
  t6036, t6042: prefer test_path_is_file, test_path_is_missing
  t6036, t6042: use test_line_count instead of wc -l
  t6036, t6042: use test_create_repo to keep tests independent

...

This commit is contained in:

Junio C Hamano 2018-06-25 13:22:36 -07:00

parent ac997db0c1 d43eba0ab5

commit 93b74a7cfa

2 changed files with 969 additions and 732 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

847

t/t6036-recursive-corner-cases.sh

File diff suppressed because it is too large Load Diff

854

t/t6042-merge-rename-corner-cases.sh

File diff suppressed because it is too large Load Diff