git.stashApply().call();
fail("Exception not thrown");
} catch (StashApplyFailureException e) {
+ // expected
}
assertEquals("content3", read(PATH));
}
git.stashApply().call();
fail("Expected conflict");
} catch (StashApplyFailureException e) {
+ // expected
}
Status status = new StatusCommand(db).call();
assertEquals(1, status.getConflicting().size());
git.stashApply().call();
fail("Exception not thrown");
} catch (StashApplyFailureException e) {
+ // expected
}
assertEquals("content2", read(PATH));
}