summaryrefslogtreecommitdiff
path: root/gitweb
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-25 01:35:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-25 01:35:58 (GMT)
commit026680f881e751311674d97d0f6ed87f06a92bfb (patch)
tree770bcfc2a3746cd568fbe17fea2926f6da2c7fa8 /gitweb
parenteca9388f398eb3256fafbf875a8a4ff5a73ab6f2 (diff)
parentba655da537a999670c7b21e0446e774a1f9733ea (diff)
downloadgit-026680f881e751311674d97d0f6ed87f06a92bfb.zip
git-026680f881e751311674d97d0f6ed87f06a92bfb.tar.gz
git-026680f881e751311674d97d0f6ed87f06a92bfb.tar.bz2
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 'gitweb')
0 files changed, 0 insertions, 0 deletions