##// END OF EJS Templates
Merge branch 'gitwash-typos' of https://github.com/rkern/ipython into rkern-gitwash-typos
Fernando Perez -
r3303:7a7b98de merge
parent child Browse files
Show More
@@ -149,7 +149,7 b' Overview'
149 149 # pull changes from github
150 150 git fetch upstream
151 151 # merge from upstream
152 git merge upstream master
152 git merge upstream/master
153 153
154 154 In detail
155 155 ---------
General Comments 0
You need to be logged in to leave comments. Login now