Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-diffdir @ 768:20e95c245bc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix local file changes being ignored after non-branch merge Bug introduced in eea96285cbf9 Spotted by TAH
author mpm@selenic.com
date Sat, 23 Jul 2005 10:00:56 -0500
parents 7e4843b7efd2
children 6592c4f5cd4f 445970ccf57a
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/\(\(---\|+++\).*\)\t.*/\1/"

hg diff -r tip | sed "s/\(\(---\|+++\).*\)\t.*/\1/"