annotate tests/binfile.bin @ 21552:61151f429a5f

update: introduce --tool for controlling the merge tool Update is a kind of merge and may also need a merge tool and should have the options described in the merge-tools help.
author Mads Kiilerich <madski@unity3d.com>
date Mon, 19 May 2014 01:53:34 +0200
parents 751df21dad72
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3368
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 1790
diff changeset
1 (binary:application/octet-stream)