diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-25 09:49:34 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-25 09:49:34 +0400 |
| commit | cc137194519a8ddbc0514da088fb012bea40df51 (patch) | |
| tree | b05c712c2688adb3009e01d64d2877323f59f113 /builtin-merge.c | |
| parent | a4d1797332bca95635168032c90765a41eacdc7a (diff) | |
| parent | c2318228ab327999520b2e5dbc9edbd619a73105 (diff) | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
test-genrandom: Add newline to usage string
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions