Uli Schlachter wrote: > doxygen/manpages/ > doxygen/manpages.cfg > > oflog/include/dcmtk/oflog/config/ > oflog/include/dcmtk/oflog/config.h > > I don't know if any of these were part of the conflict, but this might well be > possible
The relevant code in git was recently touched to solve a mysterious problem[1]. You can read all about it with ‘git log v1.7.0-rc0~1^1..v1.7.0-rc0~1^2’. It may be that Junio solved this already --- a good excuse for me to get better acquainted with those patches. Thanks for your help so far. I’ll try to reproduce this and let you know when I have more questions. [1] http://thread.gmane.org/gmane.comp.version-control.git/127768/focus=127823 http://thread.gmane.org/gmane.comp.version-control.git/128836 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
