diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-24 22:58:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-24 22:58:31 -0700 |
| commit | f06b9f1dffa67c1d28793bdaf7b2165d3d392d35 (patch) | |
| tree | 9a9e67a397cd9f98a0941f2d4ac58b9981cbd6f7 /builtin-merge.c | |
| parent | 3ac3cfb8ebd66ff57ba5e316abddc9612e7b485e (diff) | |
| parent | cc137194519a8ddbc0514da088fb012bea40df51 (diff) | |
| download | git-f06b9f1dffa67c1d28793bdaf7b2165d3d392d35.tar.gz git-f06b9f1dffa67c1d28793bdaf7b2165d3d392d35.tar.xz | |
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1:
test-genrandom: Add newline to usage string
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions