]> source.dussan.org Git - jgit.git/commit
Merge branch 'stable-5.0' 87/125487/1
authorDavid Pursehouse <david.pursehouse@gmail.com>
Wed, 4 Jul 2018 05:16:45 +0000 (14:16 +0900)
committerDavid Pursehouse <david.pursehouse@gmail.com>
Wed, 4 Jul 2018 05:16:51 +0000 (14:16 +0900)
commit67f7ca5bb60bbc091f6f7611f3f89e22746928e7
tree9c766e993fd17d3de85ff18a49d16253fb676b12
parent55ebb83c987930e0985eda8ee3b0f6a1d8c22830
parent6ba60a31277f129eda7858f5e21d04edba2a9a43
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>