Mercurial > hg
comparison tests/test-histedit-fold.t @ 38341:50f5fc232c16
morestatus: remove some extra spaces
The information about unfinished states in `hg status -v` had a lot of spaces
which are not required and feels weird. Let's limit the spacing to four spaces.
Differential Revision: https://phab.mercurial-scm.org/D3730
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Wed, 13 Jun 2018 22:50:32 +0530 |
| parents | f8f1973eaf8a |
| children | e9e61fbac787 |
comparison
equal
deleted
inserted
replaced
| 38340:9abe91a503da | 38341:50f5fc232c16 |
|---|---|
| 304 # | 304 # |
| 305 # file | 305 # file |
| 306 # | 306 # |
| 307 # To mark files as resolved: hg resolve --mark FILE | 307 # To mark files as resolved: hg resolve --mark FILE |
| 308 | 308 |
| 309 # To continue: hg histedit --continue | 309 # To continue: hg histedit --continue |
| 310 # To abort: hg histedit --abort | 310 # To abort: hg histedit --abort |
| 311 | 311 |
| 312 $ hg resolve -l | 312 $ hg resolve -l |
| 313 U file | 313 U file |
| 314 $ hg revert -r 'p1()' file | 314 $ hg revert -r 'p1()' file |
| 315 $ hg resolve --mark file | 315 $ hg resolve --mark file |