Mercurial > hg
comparison tests/test-histedit-arguments.t @ 34489:270e344a6c74
histedit: removing the experimental config 'histeditng'
This config has been around for about 2 years now. So, it can be
assumed to be stable. Therefore, I am removing the config. This also makes the
test 'test-histedit-base.t' compatible with chg.
Test Plan:
- Ran the test 'test-histedit-base.t' with and without '--chg' option.
- Ran all the other tests without '--chg' option.
- Checked the output of 'hg help histedit'.
Differential Revision: https://phab.mercurial-scm.org/D942
| author | Saurabh Singh <singhsrb@fb.com> |
|---|---|
| date | Thu, 05 Oct 2017 21:56:25 +0000 |
| parents | 6c1a9fd8361b |
| children | 1644623ab096 |
comparison
equal
deleted
inserted
replaced
| 34488:6bda8a9d8431 | 34489:270e344a6c74 |
|---|---|
| 68 # Commands: | 68 # Commands: |
| 69 # | 69 # |
| 70 # e, edit = use commit, but stop for amending | 70 # e, edit = use commit, but stop for amending |
| 71 # m, mess = edit commit message without changing commit content | 71 # m, mess = edit commit message without changing commit content |
| 72 # p, pick = use commit | 72 # p, pick = use commit |
| 73 # b, base = checkout changeset and apply further changesets from there | |
| 73 # d, drop = remove commit from history | 74 # d, drop = remove commit from history |
| 74 # f, fold = use commit, but combine it with the one above | 75 # f, fold = use commit, but combine it with the one above |
| 75 # r, roll = like fold, but discard this commit's description and date | 76 # r, roll = like fold, but discard this commit's description and date |
| 76 # | 77 # |
| 77 | 78 |
| 303 # Commands: | 304 # Commands: |
| 304 # | 305 # |
| 305 # e, edit = use commit, but stop for amending | 306 # e, edit = use commit, but stop for amending |
| 306 # m, mess = edit commit message without changing commit content | 307 # m, mess = edit commit message without changing commit content |
| 307 # p, pick = use commit | 308 # p, pick = use commit |
| 309 # b, base = checkout changeset and apply further changesets from there | |
| 308 # d, drop = remove commit from history | 310 # d, drop = remove commit from history |
| 309 # f, fold = use commit, but combine it with the one above | 311 # f, fold = use commit, but combine it with the one above |
| 310 # r, roll = like fold, but discard this commit's description and date | 312 # r, roll = like fold, but discard this commit's description and date |
| 311 # | 313 # |
| 312 | 314 |
| 539 # Commands: | 541 # Commands: |
| 540 # | 542 # |
| 541 # e, edit = use commit, but stop for amending | 543 # e, edit = use commit, but stop for amending |
| 542 # m, mess = edit commit message without changing commit content | 544 # m, mess = edit commit message without changing commit content |
| 543 # p, pick = use commit | 545 # p, pick = use commit |
| 546 # b, base = checkout changeset and apply further changesets from there | |
| 544 # d, drop = remove commit from history | 547 # d, drop = remove commit from history |
| 545 # f, fold = use commit, but combine it with the one above | 548 # f, fold = use commit, but combine it with the one above |
| 546 # r, roll = like fold, but discard this commit's description and date | 549 # r, roll = like fold, but discard this commit's description and date |
| 547 # | 550 # |
| 548 | 551 |