Mercurial > hg

comparison tests/test-histedit-outgoing.t @ 23048:ee5f834077be stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default into stable for 3.2 freeze
author Matt Mackall <mpm@selenic.com>
date Sat, 18 Oct 2014 18:04:31 -0500
parents d2a5986cb89d
children 5706d130ec16
comparison
equal deleted inserted replaced
22843:b6531d806de8 23048:ee5f834077be
47 # 47 #
48 # Commands: 48 # Commands:
49 # p, pick = use commit 49 # p, pick = use commit
50 # e, edit = use commit, but stop for amending 50 # e, edit = use commit, but stop for amending
51 # f, fold = use commit, but combine it with the one above 51 # f, fold = use commit, but combine it with the one above
52 # r, roll = like fold, but discard this commit's description
52 # d, drop = remove commit from history 53 # d, drop = remove commit from history
53 # m, mess = edit message without changing commit content 54 # m, mess = edit message without changing commit content
54 # 55 #
55 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 56 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
56 $ cd .. 57 $ cd ..
78 # 79 #
79 # Commands: 80 # Commands:
80 # p, pick = use commit 81 # p, pick = use commit
81 # e, edit = use commit, but stop for amending 82 # e, edit = use commit, but stop for amending
82 # f, fold = use commit, but combine it with the one above 83 # f, fold = use commit, but combine it with the one above
84 # r, roll = like fold, but discard this commit's description
83 # d, drop = remove commit from history 85 # d, drop = remove commit from history
84 # m, mess = edit message without changing commit content 86 # m, mess = edit message without changing commit content
85 # 87 #
86 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 88 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
87 $ cd .. 89 $ cd ..
101 # 103 #
102 # Commands: 104 # Commands:
103 # p, pick = use commit 105 # p, pick = use commit
104 # e, edit = use commit, but stop for amending 106 # e, edit = use commit, but stop for amending
105 # f, fold = use commit, but combine it with the one above 107 # f, fold = use commit, but combine it with the one above
108 # r, roll = like fold, but discard this commit's description
106 # d, drop = remove commit from history 109 # d, drop = remove commit from history
107 # m, mess = edit message without changing commit content 110 # m, mess = edit message without changing commit content
108 # 111 #
109 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 112 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
110 113