t642[23]: be more flexible for add/add conflicts involving pair renames

Elijah Newren committed about 6 years ago

t6422, t6426: be more flexible for add/add conflicts involving renames

Elijah Newren committed about 6 years ago

t6423: add an explanation about why one of the tests does not pass

Elijah Newren committed about 6 years ago

t6416, t6423: clarify some comments and fix some typos

Elijah Newren committed about 6 years ago

t6422: fix multiple errors with the mod6 test expectations

Elijah Newren committed about 6 years ago

t6423: fix test setup for a couple tests

Elijah Newren committed about 6 years ago

t6416, t6422: fix incorrect untracked file count

Elijah Newren committed about 6 years ago

t6422: fix bad check against missing file

Elijah Newren committed about 6 years ago

t6418: tighten delete/normalize conflict testcase

Elijah Newren committed about 6 years ago

Collect merge-related tests to t64xx

Elijah Newren committed about 6 years ago

progress: don't dereference before checking for NULL

Martin Ågren committed about 6 years ago

Fifth batch

Junio C Hamano committed about 6 years ago

Merge branch 'pb/guide-docs'

Junio C Hamano committed about 6 years ago

Merge branch 'so/rev-parser-errormessage-fix'

Junio C Hamano committed about 6 years ago

Merge branch 'en/eol-attrs-gotchas'

Junio C Hamano committed about 6 years ago

Merge branch 'jk/compiler-fixes-and-workarounds'

Junio C Hamano committed about 6 years ago

Merge branch 'ny/notes-doc-sample-update'

Junio C Hamano committed about 6 years ago

Merge branch 'es/adjust-subtree-test-for-merge-msg-update'

Junio C Hamano committed about 6 years ago

Merge branch 'rs/bisect-oid-to-hex-fix'

Junio C Hamano committed about 6 years ago

Merge branch 'en/merge-recursive-comment-fixes'

Junio C Hamano committed about 6 years ago