equal
deleted
inserted
replaced
1 ** Testing resolution of orphans by `hg evolve` where an obsolete changeset has |
1 ** Testing resolution of orphans by `hg evolve` where an obsolete changeset has |
2 multiple successors ** |
2 multiple successors ** |
3 |
3 |
4 $ cat >> $HGRCPATH <<EOF |
4 $ cat >> $HGRCPATH <<EOF |
|
5 > [defaults] |
|
6 > amend=-d "0 0" |
|
7 > fold=-d "0 0" |
|
8 > split=-d "0 0" |
|
9 > amend=-d "0 0" |
5 > [ui] |
10 > [ui] |
6 > interactive = True |
11 > interactive = True |
7 > [alias] |
12 > [alias] |
8 > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}" |
13 > glog = log -GT "{rev}:{node|short} {desc}\n ({bookmarks}) {phase}" |
9 > [extensions] |
14 > [extensions] |