]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1b63323) | patch
Use try-with-resources and BufferedOutputStream for local merge conflicts 64/45064/1
authorShawn Pearce <spearce@spearce.org>
Wed, 1 Apr 2015 19:52:14 +0000 (12:52 -0700)
committerShawn Pearce <spearce@spearce.org>
Wed, 1 Apr 2015 20:02:08 +0000 (13:02 -0700)
commit835955fc5b3dcb27d7da0cdfcf24b436f9828d4a
tree0129b3a738494613e05b8d59c9bdc1e6ad2f07d6tree | snapshot
parent1b633232127b28696186f55d3eba40ab38c54088commit | diff
Use try-with-resources and BufferedOutputStream for local merge conflicts

Change-Id: If5539aab1de19bb22400c862bbe2cdf7c3e85535
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit