view tests/test-resolve @ 11190:43337076ba92

Fixed a bashism with trap numbers in hgeditor.

When using trap in a shell script, it's more portable to use signal
names, instead of numbers. Signal names (INT, KILL,...) are defined in
POSIX, whereas its corresponding numbers aren't.

#!/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