# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1279758631 25200
# Node ID 6884a771ed54006db0b77210d1f57662b1d2d660
# Parent  b344537797de3f2c2b43a66dc188373fb58ba77a
merge the master

diff -r b344537797de -r 6884a771ed54 gut/main.py
--- a/gut/main.py	Wed Jul 21 16:56:34 2010 -0700
+++ b/gut/main.py	Wed Jul 21 17:30:31 2010 -0700
@@ -74,6 +74,7 @@
         if self.remote:
             call(['git', 'pull', self.remote, 'master'])
         call(['git', 'checkout', branch])
+        call(['git', 'merge', 'master'])
 
     def feature(self, name):
         """make a new feature branch"""