Merge changes I13672371,I95074358 into stable-4.2

Browse Source

* changes:
  MergeCommandTest: Use JUnit's assume to check preconditions
  MergeCommandTest: Open Git instances in try-with-resource

...

This commit is contained in:

Shawn Pearce 2016-02-15 12:59:32 -05:00 committed by Gerrit Code Review @ Eclipse.org

parent e96cb22a43 61bb701eeb

commit e9ce3a992c

1 changed files with 1054 additions and 1045 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2099

org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java

View File

File diff suppressed because it is too large Load Diff