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/t7600-merge.sh | |
parent | Merge branch 'jc/fsck-fixes' (diff) | |
parent | unpack_trees(): skip trees that are the same in all input (diff) | |
download | tgif-75513914784bb75447c71e3b001612ee37af386c.tar.xz |
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/t7600-merge.sh')
0 files changed, 0 insertions, 0 deletions