diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-24 17:35:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-24 17:35:58 -0800 |
| commit | 026680f881e751311674d97d0f6ed87f06a92bfb (patch) | |
| tree | 770bcfc2a3746cd568fbe17fea2926f6da2c7fa8 /git-pull.sh | |
| parent | Make test numbers unique (diff) | |
| parent | read-tree --debug-unpack (diff) | |
| download | tgif-026680f881e751311674d97d0f6ed87f06a92bfb.tar.xz | |
Merge branch 'jc/fix-tree-walk'
* jc/fix-tree-walk:
read-tree --debug-unpack
unpack-trees.c: look ahead in the index
unpack-trees.c: prepare for looking ahead in the index
Aggressive three-way merge: fix D/F case
traverse_trees(): handle D/F conflict case sanely
more D/F conflict tests
tests: move convenience regexp to match object names to test-lib.sh
Conflicts:
builtin-read-tree.c
unpack-trees.c
unpack-trees.h
Diffstat (limited to 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions