MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

jgit 4.4

Browse Source
This commit is contained in:
Vladimir Krivosheev
2016-08-17 11:55:09 +02:00
parent 2b8c5ece42
commit 841c291e52
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/settings-repository/lib/jgit-sources.jar
BIN
View File
Binary file not shown.
plugins/settings-repository/lib/jgit.jar
BIN
View File
Binary file not shown.
plugins/settings-repository/testSrc/GitTestCase.kt
+2 -2
View File
@@ -41,7 +41,7 @@ internal abstract class GitTestCase : IcsTestCase() {
mergeSession.conflictResolvedForFile(file, MergeSession.Resolution.AcceptedTheirs)
}
else if (Arrays.equals(mergeData.LAST, AM.MARKER_ACCEPT_MY)) {
file.setBinaryContent(mergeData.LAST!!)
file.setBinaryContent(mergeData.LAST)
mergeProvider.conflictResolvedForFile(file)
}
else {
@@ -51,7 +51,7 @@ internal abstract class GitTestCase : IcsTestCase() {
}
}
data class FileInfo(val name: String, val data: ByteArray)
class FileInfo(val name: String, val data: ByteArray)
protected fun addAndCommit(path: String): FileInfo {
val data = """<file path="$path" />""".toByteArray()