Mercurial > hg > gut
changeset 10:6884a771ed54
merge the master
| author | Jeff Hammel <jhammel@mozilla.com> |
|---|---|
| date | Wed, 21 Jul 2010 17:30:31 -0700 |
| parents | b344537797de |
| children | 68bf3598f364 |
| files | gut/main.py |
| diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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"""