Mercurial > evolve
comparison hgext/evolve.py @ 724:fa049c1d9445 stable
evolve: fix typo
| author | André Sintzoff <andre.sintzoff@gmail.com> |
|---|---|
| date | Fri, 31 May 2013 18:47:01 +0200 |
| parents | 2a325626bf06 |
| children | 892a6d708c8f |
comparison
equal
deleted
inserted
replaced
| 723:2a325626bf06 | 724:fa049c1d9445 |
|---|---|
| 1202 | 1202 |
| 1203 @command('^gdown', | 1203 @command('^gdown', |
| 1204 [], | 1204 [], |
| 1205 '') | 1205 '') |
| 1206 def cmdgdown(ui, repo): | 1206 def cmdgdown(ui, repo): |
| 1207 """update to parent an display summary lines""" | 1207 """update to parent and display summary lines""" |
| 1208 wkctx = repo[None] | 1208 wkctx = repo[None] |
| 1209 wparents = wkctx.parents() | 1209 wparents = wkctx.parents() |
| 1210 if len(wparents) != 1: | 1210 if len(wparents) != 1: |
| 1211 raise util.Abort('merge in progress') | 1211 raise util.Abort('merge in progress') |
| 1212 | 1212 |
| 1225 | 1225 |
| 1226 @command('^gup', | 1226 @command('^gup', |
| 1227 [], | 1227 [], |
| 1228 '') | 1228 '') |
| 1229 def cmdup(ui, repo): | 1229 def cmdup(ui, repo): |
| 1230 """update to child an display summary lines""" | 1230 """update to child and display summary lines""" |
| 1231 wkctx = repo[None] | 1231 wkctx = repo[None] |
| 1232 wparents = wkctx.parents() | 1232 wparents = wkctx.parents() |
| 1233 if len(wparents) != 1: | 1233 if len(wparents) != 1: |
| 1234 raise util.Abort('merge in progress') | 1234 raise util.Abort('merge in progress') |
| 1235 | 1235 |