pub fn ordered(entries: &[GitEntry]) -> Vec<GitEntry>
Entries in the order that needs attention first: conflicts, then files changed on both sides, then the rest, each group by path.