diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-07-13 14:31:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-13 14:31:36 -0700 |
| commit | 551d75dbd80cb6af08376ea8a12bdaa3f5860f35 (patch) | |
| tree | 006ba5c9799ef415c5531bfd122f0899823b351a /t/t4013/diff.diff_--stat_initial..side | |
| parent | Merge branch 'md/interix-update' (diff) | |
| parent | config.c: Make git_config() work correctly when called recursively (diff) | |
| download | git-551d75dbd80cb6af08376ea8a12bdaa3f5860f35.tar.gz git-551d75dbd80cb6af08376ea8a12bdaa3f5860f35.zip | |
Merge branch 'rj/config-cygwin'
* rj/config-cygwin:
config.c: Make git_config() work correctly when called recursively
t1301-*.sh: Fix the 'forced modes' test on cygwin
help.c: Fix detection of custom merge strategy on cygwin
Diffstat (limited to 't/t4013/diff.diff_--stat_initial..side')
0 files changed, 0 insertions, 0 deletions