view tests/test-dirstate-future @ 11452:eac141407b85 stable

merge: document how to 'undo' a merge

#!/bin/sh

hg init
echo a > a
hg add
hg ci -m1

# set mtime of a into the future
touch -t 202101011200 a

# status must not set a's entry to unset (issue1790)
hg status
hg debugstate