]> source.dussan.org Git - jgit.git/commitdiff
Merge "Fix ResolveMerger: rebase with autocrlf=true, direct checkout"
authorGunnar Wagenknecht <gunnar@wagenknecht.org>
Mon, 13 Aug 2018 11:36:44 +0000 (07:36 -0400)
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
Mon, 13 Aug 2018 11:36:44 +0000 (07:36 -0400)

Trivial merge