view tests/test-diff-binary-file @ 6005:3c33032d8906

merge: add support for tool EOL fixups specified with merge-tools:<tool>.fixeol=True
author Matt Mackall <mpm@selenic.com>
date Sun, 03 Feb 2008 19:29:05 -0600
parents 0934fef871f3
children 6c82beaaa11a
line wrap: on
line source

#!/bin/sh

hg init a
cd a
cp $TESTDIR/binfile.bin .
hg add binfile.bin
hg ci -m 'add binfile.bin' -d '0 0'

echo >> binfile.bin
hg ci -m 'change binfile.bin' -d '0 0'

hg revert -r 0 binfile.bin
hg ci -m 'revert binfile.bin' -d '0 0'

echo % diff -r 0 -r 1
hg diff --nodates -r 0 -r 1

echo % diff -r 0 -r 2
hg diff --nodates -r 0 -r 2

echo % diff --git -r 0 -r 1
hg diff --git -r 0 -r 1

echo % diff --git -r 0 -r 2
hg diff --git -r 0 -r 2