diff options
author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2013-02-22 14:03:40 +0000 |
---|---|---|
committer | <> | 2013-02-28 22:06:04 +0000 |
commit | 3b49db406667ee7189b9ea69b9d9e0bdcc43c5b7 (patch) | |
tree | 13be3ebf87cab39e68c3e4dbb1367151ac0e8a6f /magic/Magdir/diff | |
download | file-3b49db406667ee7189b9ea69b9d9e0bdcc43c5b7.tar.gz |
Imported from /home/lorry/working-area/delta_file/file-5.13.tar.gz.file-5.13baserock/morph
Diffstat (limited to 'magic/Magdir/diff')
-rw-r--r-- | magic/Magdir/diff | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/magic/Magdir/diff b/magic/Magdir/diff new file mode 100644 index 0000000..5924380 --- /dev/null +++ b/magic/Magdir/diff @@ -0,0 +1,40 @@ + +#------------------------------------------------------------------------------ +# $File: diff,v 1.14 2012/09/16 23:08:54 christos Exp $ +# diff: file(1) magic for diff(1) output +# +0 search/1 diff\ diff output text +!:mime text/x-diff +0 search/1 ***\ diff output text +!:mime text/x-diff +0 search/1 Only\ in\ diff output text +!:mime text/x-diff +0 search/1 Common\ subdirectories:\ diff output text +!:mime text/x-diff + +0 search/1 Index: RCS/CVS diff output text +!:mime text/x-diff + +# bsdiff: file(1) magic for bsdiff(1) output +0 string/b BSDIFF40 bsdiff(1) patch file + + +# unified diff +0 search/4096 ---\ +>&0 search/1024 \n +>>&0 search/1 +++\ +>>>&0 search/1024 \n +>>>>&0 search/1 @@ unified diff output text +!:mime text/x-diff +!:strength + 90 + +# librsync -- the library for network deltas +# +# Copyright (C) 2001 by Martin Pool. You may do whatever you want with +# this file. +# +0 belong 0x72730236 rdiff network-delta data + +0 belong 0x72730136 rdiff network-delta signature data +>4 belong x (block length=%d, +>8 belong x signature strength=%d) |