diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-02-09 16:41:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-09 16:41:17 -0800 |
| commit | 75513914784bb75447c71e3b001612ee37af386c (patch) | |
| tree | e48b5eb46dbb4a5b10cb795ca50491d69000455f /t/t7607-merge-overwrite.sh | |
| parent | 7fb9ec2123e8f57a22fa4b61200e5cdf7c1eb094 (diff) | |
| parent | 83c90314aa27ae3768c04375d02e4f3fb12b726d (diff) | |
| download | git-75513914784bb75447c71e3b001612ee37af386c.tar.gz | |
Merge branch 'jc/unpack-trees'
* jc/unpack-trees:
unpack_trees(): skip trees that are the same in all input
unpack-trees.c: cosmetic fix
Conflicts:
unpack-trees.c
Diffstat (limited to 't/t7607-merge-overwrite.sh')
0 files changed, 0 insertions, 0 deletions