diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-23 01:39:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-23 01:39:50 -0700 |
| commit | d32643c0ff6d74b967b65e867f1f99dba840836e (patch) | |
| tree | 1c667614f8a1ec71fa79150d3cac03197fb4ae60 /show-index.c | |
| parent | e05aae684d453695bc5bd1e66aa96bc7d42e186a (diff) | |
| parent | bf74106a5b4577fd695d15a28ad51537ae7470d8 (diff) | |
| download | git-d32643c0ff6d74b967b65e867f1f99dba840836e.tar.gz | |
Merge branch 'do/maint-merge-recursive-fix'
* do/maint-merge-recursive-fix:
merge-recursive: never leave index unmerged while recursing
Diffstat (limited to 'show-index.c')
0 files changed, 0 insertions, 0 deletions