> > Signed-off-by: Dan McGee <dan at archlinux.org> > > :040000 040000 ea3e9f52732a5412f2e77e2a1060c3247636de7b > a234d7e4ca725edc301f696640d897ce54dfb3b8 M lib > """" > OMG. That part is totally unrelated here, but it makes our fileconflict003.py pass (due to its "bug");-). Obviously that won't solve our problem (unfortunately). Bye