diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-22 22:29:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-22 22:29:50 -0700 |
| commit | 0737975d161a557da95efa67decae64aa9037b6d (patch) | |
| tree | c9be22340203cb999e775661db9ff4644ca2cfbc /xdiff/xmerge.c | |
| parent | Merge branch 'jk/maint-diffstat-overflow' into maint (diff) | |
| parent | documentation: clarify direction of core.autocrlf (diff) | |
| download | tgif-0737975d161a557da95efa67decae64aa9037b6d.tar.xz | |
Merge branch 'wp/doc-filter-direction' into maint
* wp/doc-filter-direction:
documentation: clarify direction of core.autocrlf
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions