diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:35:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-06 12:35:12 -0800 |
| commit | cfdfc5a3b2289dd54a25d7523c0cf4d3e6efd84b (patch) | |
| tree | 503da39e6dd48ce65ac8c19668c647f034fdf47e /userdiff.h | |
| parent | t5550: repack everything into one file (diff) | |
| parent | Merge branch 'maint-1.7.6' into maint-1.7.7 (diff) | |
| download | tgif-cfdfc5a3b2289dd54a25d7523c0cf4d3e6efd84b.tar.xz | |
Merge branch 'maint-1.7.7' into maint
* maint-1.7.7:
Documentation: rerere.enabled is the primary way to configure rerere
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions