gitk: Cope with unmerged files in local changes