]> source.dussan.org Git - jgit.git/commit
Merge branch 'stable-4.6' into stable-4.7 98/122398/1
authorMatthias Sohn <matthias.sohn@sap.com>
Thu, 10 May 2018 09:59:56 +0000 (11:59 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Thu, 10 May 2018 09:59:56 +0000 (11:59 +0200)
commit1887c834772d9e035b50ebda4922aa5c8159a31f
tree7034915434b5906ea897cee9d732c6b57e198f9b
parent5f79ef0ba495dbcf03eb4923ae7ce039fc8ab4ec
parent9253a6c5caea9cd95d5839f155c4e9434b16b6ab
Merge branch 'stable-4.6' into stable-4.7

* stable-4.6:
  Retry stale file handles on .git/config file

Change-Id: If5a21d38224528edfc551b3216daca6a2582e3ac
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
org.eclipse.jgit/src/org/eclipse/jgit/storage/file/FileBasedConfig.java