diff options
author | David Pursehouse <david.pursehouse@gmail.com> | 2018-07-04 14:08:56 +0900 |
---|---|---|
committer | David Pursehouse <david.pursehouse@gmail.com> | 2018-07-04 14:09:01 +0900 |
commit | c296342333ab43596452ea040fb608f613a3e4b8 (patch) | |
tree | 9c8b3955096ce9dc71ca2a24a873a15272e931dc /org.eclipse.jgit.test/tst | |
parent | f5b25bcad344b12fd0cb87b72a98d6e07d65833d (diff) | |
parent | 1dcb0688c7c229501e6a486c03ffe251d5ed2761 (diff) | |
download | jgit-c296342333ab43596452ea040fb608f613a3e4b8.tar.gz jgit-c296342333ab43596452ea040fb608f613a3e4b8.zip |
Merge branch 'stable-4.7' into stable-4.8
* stable-4.7:
ResolveMerger: Fix encoding with string; use bytes
Change-Id: If17328fbd101d596a8a16d9c4a190e9b6e120902
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit.test/tst')
0 files changed, 0 insertions, 0 deletions