Merged and edited git differences