/
uis
/
git
/
x
/
uis
/
git
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bc6d33e
6b82db9
)
Merge branch 'en/t6036-recursive-corner-cases'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 2 Aug 2018 22:30:39 +0000
(15:30 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 2 Aug 2018 22:30:39 +0000
(15:30 -0700)
Tests to cover more D/F conflict cases have been added for
merge-recursive.
* en/t6036-recursive-corner-cases:
t6036: fix broken && chain in sub-shell
t6036: add lots of detail for directory/file conflicts in recursive case
Trivial merge
/ uis / git / x / uis / git / git.git / commitdiff