diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-08-24 14:29:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-24 14:29:37 -0700 |
| commit | 97e5f4908dd22c99e825ccb254f05a61fda8d19c (patch) | |
| tree | 72d9d7d5d33393551b0d68df71b254863be5e42f /Makefile | |
| parent | Documentation: clarify pager configuration (diff) | |
| parent | merge: fix numerus bugs around "trivial merge" area (diff) | |
| download | tgif-97e5f4908dd22c99e825ccb254f05a61fda8d19c.tar.xz | |
Merge branch 'mv/maint-merge-fix' into maint
* mv/maint-merge-fix:
merge: fix numerus bugs around "trivial merge" area
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions