diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-01-19 08:26:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-19 08:26:44 -0800 |
| commit | ae830c211bfbf192bcefb821130fe4943daf4291 (patch) | |
| tree | 12b2e5f2aedd31a599968fac42da18ad184e894d /resolve-undo.h | |
| parent | 8a59702ad888c8c399b096759c1c678ffeca5b03 (diff) | |
| parent | ab4356111afb28568bf1ad2e909b6ecf9f83a5e6 (diff) | |
| download | git-ae830c211bfbf192bcefb821130fe4943daf4291.tar.gz git-ae830c211bfbf192bcefb821130fe4943daf4291.tar.xz | |
Merge branch 'jk/diff-driver-binary-doc' into maint
* jk/diff-driver-binary-doc:
docs: explain diff.*.binary option
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions