From: David Pursehouse <david.pursehouse@gmail.com>
Date: Wed, 4 Jul 2018 05:16:45 +0000 (+0900)
Subject: Merge branch 'stable-5.0'
X-Git-Tag: v5.1.0.201808281540-m3~63
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=67f7ca5bb60bbc091f6f7611f3f89e22746928e7;p=jgit.git

Merge branch 'stable-5.0'

* stable-5.0:
  ResolveMerger: Fix encoding with string; use bytes

Change-Id: I8e6d0c92144db3bf57ea05f93852ac015458260b
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
---

67f7ca5bb60bbc091f6f7611f3f89e22746928e7