view tests/test-issue352 @ 4259:bda63383d529

Make import opportunistically use merge information
author Brendan Cully <brendan@kublai.com>
date Wed, 21 Mar 2007 14:06:25 -0700
parents 08d31e43592a
children b90e323a4781
line wrap: on
line source

#!/bin/bash
# http://www.selenic.com/mercurial/bts/issue352

hg init foo
cd foo

A=`echo -e -n 'he\rllo'`

echo foo > "$A"
hg add
hg ci -A -m m
rm "$A"

echo foo > "hell
o"
hg add
hg ci -A -m m

echo foo > "$A"
hg debugwalk

exit 0