view tests/test-diffdir @ 829:764b0350acb8

Shortened hgmerge a little bit.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 04 Aug 2005 17:16:41 +0100
parents 0902ffece4b4
children d997148155f2 52d8d81e72ad 4f81068ed8cd
line wrap: on
line source

#!/bin/sh

hg init
touch a
hg add a
hg ci -m "a" -d "0 0"

echo 123 > b
hg add b
hg diff | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/"

hg diff -r tip | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/"