diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-06-13 17:09:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-13 17:09:50 -0700 |
| commit | 9b7dc7183528d42c46786a0be1acc58d4cd1f47a (patch) | |
| tree | df825302756fe359cbc1e5119b7573cbdb1ac5d8 /builtin-merge-recursive.c | |
| parent | Merge branch 'maint-1.6.1' into maint-1.6.2 (diff) | |
| parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
| download | tgif-9b7dc7183528d42c46786a0be1acc58d4cd1f47a.tar.xz | |
Merge branch 'maint-1.6.1' into maint-1.6.2
* maint-1.6.1:
git-rerere.txt: grammatical fixups and cleanups
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions