diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-06-21 21:15:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-21 21:15:27 -0700 |
| commit | d836118be990867be3a4d3ce932f58d761e5e612 (patch) | |
| tree | 5d8d0f02e79fec24bf034d1660c81f70e4423512 /builtin-ls-files.c | |
| parent | Merge branch 'mn/maint-iconv-autoconf' into maint (diff) | |
| parent | refuse to merge during a merge (diff) | |
| download | tgif-d836118be990867be3a4d3ce932f58d761e5e612.tar.xz | |
Merge branch 'cb/maint-no-double-merge' into maint
* cb/maint-no-double-merge:
refuse to merge during a merge
Diffstat (limited to 'builtin-ls-files.c')
0 files changed, 0 insertions, 0 deletions