Jonathan Nieder <jrnie...@gmail.com> writes: > Junio, how do you prefer to handle this in git.git? Would you need to > amend the patch to remove the git-gui/.gitattributes change and wait > to get it from Pat, or is getting the same change twice okay?
Yes, getting the same change twice should be fine. I'll see conflicts when I update from Pat when it happens next time, but we know what the resolution should be already.
