From: Gunnar Wagenknecht <gunnar@wagenknecht.org>
Date: Mon, 13 Aug 2018 11:36:44 +0000 (-0400)
Subject: Merge "Fix ResolveMerger: rebase with autocrlf=true, direct checkout"
X-Git-Tag: v5.1.0.201808281540-m3~39
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=82e0c4a084c915e47e060f59cd25642d6becaed9;p=jgit.git

Merge "Fix ResolveMerger: rebase with autocrlf=true, direct checkout"
---

82e0c4a084c915e47e060f59cd25642d6becaed9