tree ce1d18e41ceb80948e8be6813280598fc8415cf0
parent e96cb22a43e8e67274e39b3d5fb852a20e9b3a04
parent 61bb701eebb8b6701510dff392f6370a54358e13
author Shawn Pearce <spearce@spearce.org> 1455559172 -0500
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> 1455559173 -0500

Merge changes I13672371,I95074358 into stable-4.2

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