git - show conflicyiong files