diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-01 08:59:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-01 08:59:14 -0700 |
| commit | 0cb24fe86eea8bbbc7f33ede78ccf3113cd7b8c3 (patch) | |
| tree | e64dfaddca6fb9ee827f1d2cf451382e1def76ab /merge-recursive.h | |
| parent | a32a0c29dfa7064d010a9d3b7a8970e6dd400999 (diff) | |
| parent | 0d158ebb92c1302d987304fa7b717ba4d72aecdf (diff) | |
| download | git-0cb24fe86eea8bbbc7f33ede78ccf3113cd7b8c3.tar.gz | |
Merge branch 'rr/test-3200-style'
Churns.
* rr/test-3200-style:
t3200 (branch): modernize style
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions