diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-19 16:14:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-19 16:14:43 -0700 |
| commit | 36d225c7d4205bcc52301d78a132f4a851895812 (patch) | |
| tree | 27bb79b5de922d3084d8b36d5ac589945609def9 /commit.c | |
| parent | 2befe97201e1f3175cce557866c5822793624b5a (diff) | |
| parent | 1f3c9ba707d8ac00bfa5f2afc76146a1149102a1 (diff) | |
| download | git-36d225c7d4205bcc52301d78a132f4a851895812.tar.gz | |
Merge branch 'en/merge-tests'
Updates to "git merge" tests, in preparation for a new merge
strategy backend.
* en/merge-tests:
t6425: be more flexible with rename/delete conflict messages
t642[23]: be more flexible for add/add conflicts involving pair renames
t6422, t6426: be more flexible for add/add conflicts involving renames
t6423: add an explanation about why one of the tests does not pass
t6416, t6423: clarify some comments and fix some typos
t6422: fix multiple errors with the mod6 test expectations
t6423: fix test setup for a couple tests
t6416, t6422: fix incorrect untracked file count
t6422: fix bad check against missing file
t6418: tighten delete/normalize conflict testcase
Collect merge-related tests to t64xx
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions