![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Jan 2010 01:35:58 +0000 (17:35 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Jan 2010 01:35:58 +0000 (17:35 -0800) | ||
| commit | 026680f881e751311674d97d0f6ed87f06a92bfb | |
| tree | 770bcfc2a3746cd568fbe17fea2926f6da2c7fa8 | tree | snapshot |
| parent | eca9388f398eb3256fafbf875a8a4ff5a73ab6f2 | commit | diff |
| parent | ba655da537a999670c7b21e0446e774a1f9733ea | commit | diff |
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
* 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
| builtin-read-tree.c | diff1 | | diff2 | | blob | history |
| cache.h | diff1 | | diff2 | | blob | history |
| diff-lib.c | diff1 | | diff2 | | blob | history |
| diff.c | diff1 | | diff2 | | blob | history |
| diff.h | diff1 | | diff2 | | blob | history |
| t/test-lib.sh | diff1 | | diff2 | | blob | history |
| unpack-trees.c | diff1 | | diff2 | | blob | history |
| unpack-trees.h | diff1 | | diff2 | | blob | history |