diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-15 14:11:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-15 14:11:16 -0700 |
| commit | a0d9b7f0154cb220743fa872998eb7728e1005e6 (patch) | |
| tree | 48120c3d7ec8592af6e36f45cb5e60b51dd37ce9 /merge.c | |
| parent | Merge branch 'jk/fix-remote-curl-url-wo-proto' (diff) | |
| parent | diff: remove dead code (diff) | |
| download | tgif-a0d9b7f0154cb220743fa872998eb7728e1005e6.tar.xz | |
Merge branch 'sb/diff-cleanup'
Code cleanup.
* sb/diff-cleanup:
diff: remove dead code
diff: omit found pointer from emit_callback
diff.c: use diff_options directly
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions