equal
deleted
inserted
replaced
46 hg up -C good |
46 hg up -C good |
47 hg up -C good |
47 hg up -C good |
48 hg merge |
48 hg merge |
49 hgcommit -m 'merged heads' |
49 hgcommit -m 'merged heads' |
50 |
50 |
|
51 echo '% hg update -C 8' |
|
52 hg update -C 8 |
51 |
53 |
|
54 echo '% hg branch some-branch' |
|
55 hg branch some-branch |
|
56 echo '% hg commit' |
|
57 hgcommit -m 'started some-branch' |
|
58 echo '% hg commit --close-branch' |
|
59 hgcommit --close-branch -m 'closed some-branch' |
|
60 |
|
61 echo '% hg update default' |
|
62 hg update default |
|
63 echo '% hg merge some-branch' |
|
64 hg merge some-branch |
|
65 echo '% hg commit (no reopening of some-branch)' |
|
66 hgcommit -m 'merge with closed branch' |
|
67 |
|
68 cat >> $HGRCPATH <<EOF |
|
69 [extensions] |
|
70 graphlog = |
|
71 EOF |
|
72 |
|
73 #hg glog |