Mercurial > hg
comparison tests/test-histedit-arguments.t @ 20503:23dc77874191
histedit: clarify description of fold command
N and (N-1) didn't add any information to description of fold.
More useful is refering to the commit list as it is displayed in editor.
| author | Adrian Zgorzałek <adek@fb.com> |
|---|---|
| date | Thu, 13 Feb 2014 18:05:35 -0800 |
| parents | 45c3086880c7 |
| children | 5840da876235 |
comparison
equal
deleted
inserted
replaced
| 20502:7648e9aef6ee | 20503:23dc77874191 |
|---|---|
| 49 pick c8e68270e35a 3 four | 49 pick c8e68270e35a 3 four |
| 50 pick 08d98a8350f3 4 five | 50 pick 08d98a8350f3 4 five |
| 51 | 51 |
| 52 # Edit history between eb57da33312f and 08d98a8350f3 | 52 # Edit history between eb57da33312f and 08d98a8350f3 |
| 53 # | 53 # |
| 54 # Commits are listed from least to most recent | |
| 55 # | |
| 54 # Commands: | 56 # Commands: |
| 55 # p, pick = use commit | 57 # p, pick = use commit |
| 56 # e, edit = use commit, but stop for amending | 58 # e, edit = use commit, but stop for amending |
| 57 # f, fold = use commit, but fold into previous commit (combines N and N-1) | 59 # f, fold = use commit, but fold into previous commit (combines this commit with the one above) |
| 58 # d, drop = remove commit from history | 60 # d, drop = remove commit from history |
| 59 # m, mess = edit message without changing commit content | 61 # m, mess = edit message without changing commit content |
| 60 # | 62 # |
| 61 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 63 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 62 | 64 |