Skip to content
[Jenkins]Jenkins
log in

Changes

Summary

  1. NameConflictTreeWalk: Mark repo param @Nullable (details)
  2. ResolveMergerTest: Add tests for content merges (details)
Commit e4672d1c16c2dae3c8315c5b87abfd5aa49f3800 by Dave Borowitz
NameConflictTreeWalk: Mark repo param @Nullable

This is passed directly to the super constructor, where it is also
@Nullable. Marking it here saves the reader a jump.

Change-Id: Icc8db2f2dc6aae6e591aa4f09a3c283336a5424c
The file was modified org.eclipse.jgit/src/org/eclipse/jgit/treewalk/NameConflictTreeWalk.java
Commit edb6593ef00ae6e16f6cbbf7250bbfbf19d2a346 by Dave Borowitz
ResolveMergerTest: Add tests for content merges

Change-Id: I2b85cc239e9b3090426c956cbf9af3deb4106a41
The file was modified org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java