diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:26 -0700 |
| commit | 4e530c5049a305f82c3e4768b26e6a689aa3c84e (patch) | |
| tree | 3705739dc7b4ba40e80d81715c65077d78ef75b3 /ll-merge.c | |
| parent | Merge branch 'mg/maint-difftool-vim-readonly' into maint (diff) | |
| parent | diff: don't retrieve binary blobs for diffstat (diff) | |
| download | tgif-4e530c5049a305f82c3e4768b26e6a689aa3c84e.tar.xz | |
Merge branch 'jk/diffstat-binary' into maint
* jk/diffstat-binary:
diff: don't retrieve binary blobs for diffstat
diff: handle diffstat of rewritten binary files
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions