| commit | a32016be06daadfebed447c46b98041d71b428fc | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Mar 2011 21:32:09 +0000 (18 14:32 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Mar 2011 21:32:09 +0000 (18 14:32 -0700) | ||
| tree | 701f0c5ec2057f89da32e7c357e10b2dadaad23c | treesnapshot (tar.gz zip) |
| parent | 5ddab49db998cfee6ab9246eb440fd0c66966543 | commitdiff |
| parent | b9b3eef76186d423efb684d01b3e99ef010a61de | commitdiff |
Merge branch 'en/merge-recursive' into next
* en/merge-recursive:
merge-recursive: tweak magic band-aid
* en/merge-recursive:
merge-recursive: tweak magic band-aid
| merge-recursive.c | diff1 | diff2 | blobhistory |