index d0af8c3d52573fea203aab13612a9103cca78dd9..de4e5eb61f5cc197a51005c6cfbd3bf2b9428480 100755 (executable)
check_result () {
git-ls-files --stage | sed -e 's/ '"$_x40"' / X /' >current &&
- diff -u expected current
+ git diff expected current
}
# This is done on an empty work directory, which is the normal
9 exists O!=A missing no merge must match A and be
up-to-date, if exists.
------------------------------------------------------------------
- 10 exists O==A missing remove ditto
+ 10 exists O==A missing no merge must match A
------------------------------------------------------------------
11 exists O!=A O!=B no merge must match A and be
A!=B up-to-date, if exists.