Make the commit browser properly handle merge commits