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