]> source.dussan.org Git - jgit.git/commitdiff
projects / jgit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55ebb83 6ba60a3)
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)
* stable-5.0:
  ResolveMerger: Fix encoding with string; use bytes

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

Trivial merge
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit