Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-diff-binary-file @ 5340:ad8783fe20f7
darcs2hg: Now detects and recovers from simple darcs conflicts.
author | Terry Smith <terry@t11e.com> |
---|---|
date | Tue, 11 Sep 2007 13:13:54 -0400 |
parents | 0934fef871f3 |
children |
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