- Code: Select all
CONFLICT (delete/modify): tests/fate2.mak deleted in 48706f41e1a17e04b0aa09852eff021833708233 and modified in HEAD. Version HEAD of tests/fate2.mak left in tree.
CONFLICT (content): Merge conflict in tests/ref/seek/lavf_mxf
Automatic merge failed; fix conflicts and then commit the result.
Fatal error occurred, aborting build.
As I am only interested in mencoder/mplayer, it works for me, but doesn't build all the stuff though.