Mercurial > hg
comparison tests/test-graft.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 | 47f5454a30ed |
| children | 5cdfc20bfd5f |
comparison
equal
deleted
inserted
replaced
| 38340:9abe91a503da | 38341:50f5fc232c16 |
|---|---|
| 234 # | 234 # |
| 235 # e | 235 # e |
| 236 # | 236 # |
| 237 # To mark files as resolved: hg resolve --mark FILE | 237 # To mark files as resolved: hg resolve --mark FILE |
| 238 | 238 |
| 239 # To continue: hg graft --continue | 239 # To continue: hg graft --continue |
| 240 # To abort: hg update --clean . (warning: this will discard uncommitted changes) | 240 # To abort: hg update --clean . (warning: this will discard uncommitted changes) |
| 241 | 241 |
| 242 | 242 |
| 243 Commit while interrupted should fail: | 243 Commit while interrupted should fail: |
| 244 | 244 |
| 245 $ hg ci -m 'commit interrupted graft' | 245 $ hg ci -m 'commit interrupted graft' |