diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-09 00:23:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-09 00:23:45 -0700 |
| commit | 9e6c7e01871920379c299db53b2faab2fe7d093c (patch) | |
| tree | 7fb90a24816d8a524500cab04d054e62dd2a5477 /merge-file.c | |
| parent | a6261668549ed2b1c52b526e87a097c2703443fa (diff) | |
| parent | a0cb94006ccc6bde6fe89b2a4d8bf7ea84c8b876 (diff) | |
| download | git-9e6c7e01871920379c299db53b2faab2fe7d093c.tar.gz | |
Merge branch 'jc/diffopt'
* jc/diffopt:
diff -S: release the image after looking for needle in it
diff -M: release the preimage candidate blobs after rename detection.
diff.c: do not use a separate "size cache".
diff: release blobs after generating textual diff.
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions