diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-22 09:35:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-22 09:35:36 -0700 |
| commit | 262657dce61b417d712a7f4cd85ff8ff4c6ec3a4 (patch) | |
| tree | 1074778dccb10ef6cfe3a63d2a0d6b21dded3d34 /merge-recursive.h | |
| parent | Merge branch 'js/maint-receive-pack-symref-alias' (diff) | |
| parent | Update draft release notes to 1.7.1.1 (diff) | |
| download | tgif-262657dce61b417d712a7f4cd85ff8ff4c6ec3a4.tar.xz | |
Merge branch 'maint'
* maint:
Update draft release notes to 1.7.1.1
tests: remove unnecessary '^' from 'expr' regular expression
Conflicts:
diff.c
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions