view tests/test-resolve @ 11324:cdf6d861b207

ui: add ui.formatted configuration variable and accessor function.

This new configuration variable is similar in nature `ui.interactive',
but applying to output instead of input. This allows as to support
non-interactive sessions where formatted should be enabled, such as
when using the pager extension.

The variable itself is left undocumented; it is not intended for use
outside Mercurial and its extensions.

#!/bin/sh

# test that a commit clears the merge state.

hg init repo
cd repo

echo foo > file
hg commit -Am 'add file'

echo bar >> file
hg commit -Am 'append bar'

echo % create a second head
hg up -C 0
echo baz >> file
hg commit -Am 'append baz'

echo % failing merge
HGMERGE=internal:fail hg merge

echo resolved > file
hg resolve -m file
hg commit -m 'resolved'

echo % resolve -l, should be empty
hg resolve -l