Stefan Sperling wrote: > On Mon, Jan 14, 2013 at 09:34:00PM +0000, Julian Foad wrote: (Re. issue #4221 "Trivial merge of a binary file with svn:keywords raises a conflict".) >> Stefan, you asked the reporter to file it against 1.8.0; what do you think? > > I mainly asked for this so that the issue would get some attention, > and did intend to look into it eventually. > The issue should probably have been marked 1.8-consider instead, since it > is not a regression. But I'm glad you've picked it up and I hope that > good results will come out of your work on this issue!
OK, so I've changed the milestone to 1.8-consider but am still working on it. - Julian