diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-13 19:50:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-13 19:50:22 (GMT) |
| commit | 0a17b2cd7ebc0beeab6121d96ce812f22994cc39 (patch) | |
| tree | 85dd8e39916a822c2ce5ee98e284a19a9a632297 /compat | |
| parent | 7d40f89137b456820d51ebc1cbb3ffbb966e7fec (diff) | |
| parent | c8c562a238071843c64ea0f3a2c85481606da379 (diff) | |
| download | git-0a17b2cd7ebc0beeab6121d96ce812f22994cc39.zip git-0a17b2cd7ebc0beeab6121d96ce812f22994cc39.tar.gz git-0a17b2cd7ebc0beeab6121d96ce812f22994cc39.tar.bz2 | |
Merge branch 'cb/maint-no-double-merge'
* cb/maint-no-double-merge:
refuse to merge during a merge
Diffstat (limited to 'compat')
0 files changed, 0 insertions, 0 deletions