[EGIT Patches] Sort order from hell fixes

This fixes conflict detection in checkout that yielded false conflicts
and, according to a user, a problem where checkin did not find anything
to check in.

-- robin