view tests/test-conflict @ 662:b55a78595ef6

Pass username to hgeditor, remove temporary file
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <[e-mail]>
# Node ID 5c5d1484b51a53918575a199ab8985160f0ce2d7
# Parent  8c89408a7154d2da94766e957a088407fd0fef93
Pass username to hgeditor, remove temporary file

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