* Detect and handle a checkout conflict during merge nicely
* Simplify size test in PackWriter * Declare critical exposed methods of ObjectToPack final * Declare internal flag accessors of ObjectToPack final * Remove unused method isDeltaAttempted() * Simplify setDoNotDelta() to always set the flag
* Fix UnionInputStream.read to be more Java-like
* Use working tree iterator to compare file modes
* Enable loading history until a given commit