tests/test-conflict

Hide file hashes in log

There are six different kinds of revision numbers and hashes:

changeset hash and local number
manifest hash and local number
file hash and local number

We really ought to expose only the changeset hash and local number, so
begin hiding the others from the end user

manifest hash: 40d07cc930e84a9283d5e03ade23e3454401e148

#!/bin/sh

set -x
hg init
echo "nothing" > a
hg add a
hg commit -t ancestor -u test -d "0 0"
echo "something" > a
hg commit -t branch1 -u test -d "0 0"
hg co 0
echo "something else" > a
hg commit -t branch2 -u test -d "0 0"
export HGMERGE=merge
hg up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status