nick@linuxamd:mesa$ git pull
remote: Generating pack...
remote: Counting objects: 3491
remote: Done counting 13166 objects.
remote: Result has 12148 objects.
remote: Deltifying 12148 objects...
remote:  100% (12148/12148) done
remote: Total 12148 (delta 9997), reused 874 (delta 709)
Receiving objects: 100% (12148/12148), 2.15 MiB | 147 KiB/s, done.
Resolving deltas: 100% (9997/9997), completed with 599 local objects.
From git://anongit.freedesktop.org/git/mesa/mesa
   25e658a..4528287  gallium-0.1 -> origin/gallium-0.1
   46c4056..d76545d  master     -> origin/master
   1837b8c..096e35d  mesa_7_0_branch -> origin/mesa_7_0_branch
   5578f8c..72d7d2b  softpipe_0_1_branch -> origin/softpipe_0_1_branch
Updating 46c4056..d76545d
configs/default: needs update
include/GL/internal/dri_interface.h: needs update
src/glx/x11/glcontextmodes.c: needs update
fatal: Entry 'configs/default' not uptodate. Cannot merge.