| commit | 0a17b2cd7ebc0beeab6121d96ce812f22994cc39 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 13 Jun 2009 19:50:22 +0000 (13 12:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 13 Jun 2009 19:50:22 +0000 (13 12:50 -0700) | ||
| tree | 85dd8e39916a822c2ce5ee98e284a19a9a632297 | treesnapshot (tar.gz zip) |
| parent | 7d40f89137b456820d51ebc1cbb3ffbb966e7fec | commitdiff |
| parent | c8c562a238071843c64ea0f3a2c85481606da379 | commitdiff |
Merge branch 'cb/maint-no-double-merge'
* cb/maint-no-double-merge:
refuse to merge during a merge
* cb/maint-no-double-merge:
refuse to merge during a merge
| builtin-merge.c | diff1 | diff2 | blobhistory |