Mercurial > hg
view tests/test-rebase-mq-skip.out @ 12083:ebfc46929f3e stable
help: refer to user configuration file more consistently
Currently, a number of commands and help topics mention the user hgrc
file in different ways. Among these are following:
1. .hgrc - "please specify your commit editor/username in your .hgrc
file", bookmarks, color, hgk, pager, hg help environment
2. $HOME/.hgrc - hg help paths, hgrc(5), hg(1)
3. ~/.hgrc - hgrc(5)
In addition to being inconsistent, none of these make sense on
Windows. This patch replaces the above with a more general term of
"[your] configuration file".
author | Brodie Rao <brodie@bitheap.org> |
---|---|
date | Fri, 27 Aug 2010 22:36:35 -0400 |
parents | 00f8e7837668 |
children |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved % "Mainstream" import p1.patch 1 files updated, 0 files merged, 2 files removed, 0 files unresolved applying p1.patch % Rebase 1 files updated, 0 files merged, 1 files removed, 0 files unresolved saved backup bundle to @ 3 P0 tags: p0.patch qbase qtip tip | o 2 P1 tags: qparent | o 1 R1 tags: | o 0 C1 tags: % Now with --continue adding r0 adding r1 adding r2 adding r3 adding r4 adding r5 adding r6 0 files updated, 0 files merged, 6 files removed, 0 files unresolved adding r1 created new head adding r3 adding r7 adding r8 adding r4 adding r6 3 files updated, 0 files merged, 2 files removed, 0 files unresolved abort: fix unresolved conflicts with hg resolve then run hg rebase --continue saved backup bundle to @ 9 r5 tags: 5.diff qtip tip | o 8 r4 tags: 4.diff | o 7 r2 tags: 2.diff qbase | o 6 branch2-r6 tags: qparent | o 5 branch2-r4 tags: | o 4 branch2-r8 tags: | o 3 branch2-r7 tags: | o 2 branch2-r3 tags: | o 1 branch2-r1 tags: | o 0 r0 tags: