/srv/irclogs.ubuntu.com/2008/11/29/#ubuntu-x.txt

tjaaltonok, looks like my mesa git merge is broken beyond recognition.. for some reason07:17
tjaaltonthere doesn't seem to be a merge strategy to always use the remote branch07:19
tjaaltonafk->07:57
jcristautjaalton: checkout master, pull -s ours upstream-experimental, then merge the packaging branch18:39
jcristauor something like that18:39

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!