diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-06-13 12:50:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-13 12:50:22 -0700 |
| commit | 0a17b2cd7ebc0beeab6121d96ce812f22994cc39 (patch) | |
| tree | 85dd8e39916a822c2ce5ee98e284a19a9a632297 /builtin-config.c | |
| parent | Merge branch 'ph/submodule-rebase' (early part) (diff) | |
| parent | refuse to merge during a merge (diff) | |
| download | tgif-0a17b2cd7ebc0beeab6121d96ce812f22994cc39.tar.xz | |
Merge branch 'cb/maint-no-double-merge'
* cb/maint-no-double-merge:
refuse to merge during a merge
Diffstat (limited to 'builtin-config.c')
0 files changed, 0 insertions, 0 deletions