view tests/test-merge9.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".

adding bar
adding foo
adding quux1
adding quux2
created new head
merging bar
merging bar failed!
merging foo and baz to baz
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
U bar
R baz
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging bar
merging bar failed!
merging baz and foo to baz
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
% show unresolved
U bar
R baz
% unmark baz
% show
U bar
U baz
M bar
M baz
M quux2
? bar.orig
% re-resolve baz
merging baz and foo to baz
% after
U bar
R baz
% resolve all warning
abort: no files or directories specified; use --all to remerge all files
% resolve all
merging bar
warning: conflicts during merge.
merging bar failed!
% after
U bar
R baz