diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-05-25 22:43:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-25 22:43:05 -0700 |
| commit | 8366b7baae7e5a33f609b07c939a3571653a2314 (patch) | |
| tree | c4ba1932ba5b3dbd15cee76101160a1de15a9b4e /t/t6031-merge-recursive.sh | |
| parent | Ignore no-op changes in paranoid update hook (diff) | |
| parent | Merge branch 'jk/maint-send-email-compose' into maint (diff) | |
| download | tgif-8366b7baae7e5a33f609b07c939a3571653a2314.tar.xz | |
Merge branch 'maint'
* maint:
builtin-fast-export: Only output a single parent per line
Release Notes for 1.5.5.2
Conflicts:
RelNotes
Diffstat (limited to 't/t6031-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions