Support git-style merge chunks

Git uses 7 characters instead of 4. Not sure how well this will work,
but let's try it.