status: list unmerged files much later