git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 980b482)
rebase tests: repeat some tests using the merge backend instead of am
authorElijah Newren <redacted>
Sat, 15 Feb 2020 21:36:38 +0000 (21:36 +0000)
committerJunio C Hamano <redacted>
Sun, 16 Feb 2020 23:40:42 +0000 (15:40 -0800)
commit76340c8107ba8e658f9cc76d1d220bac2944d1f1
tree4b550f1254a1f4f3e37da170c1cfa94c5494b0c7tree | snapshot
parent980b482d28482c307648c3abbcb16ae60843c7aecommit | diff
rebase tests: repeat some tests using the merge backend instead of am

In order to ensure the merge/interactive backend gets similar coverage
to the am one, add some tests for cases where previously only the am
backend was tested.

Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t5520-pull.sh diff | blob | history
t/t6047-diff3-conflict-markers.sh diff | blob | history
git clone https://git.99rst.org/PROJECT