equal
deleted
inserted
replaced
38 |
38 |
39 Amending revision 1 in a way that causes conflicts |
39 Amending revision 1 in a way that causes conflicts |
40 |
40 |
41 $ echo apricot > a |
41 $ echo apricot > a |
42 $ hg amend -m 'apricot' |
42 $ hg amend -m 'apricot' |
43 2 new orphan changesets |
|
44 |
43 |
45 $ hg glog --hidden |
44 $ hg glog --hidden |
46 @ 4: apricot |
45 @ 4: apricot |
47 | |
46 | |
48 | * 3: coconut |
47 | o 3: coconut |
49 | | |
48 | | |
50 | * 2: banana |
49 | o 2: banana |
51 | | |
50 | | |
52 | x 1: apple |
51 | x 1: apple |
53 |/ |
52 |/ |
54 o 0: empty |
53 o 0: empty |
55 |
54 |