unpack-trees: fix "read-tree -u --reset A B" with conflicted index
[gitweb.git] / t / t4034 /
drwxr-xr-x   parent (dest: t; base: b018ff6085)
drwxr-xr-x - bibtex
drwxr-xr-x - cpp
drwxr-xr-x - csharp
drwxr-xr-x - fortran
drwxr-xr-x - html
drwxr-xr-x - java
drwxr-xr-x - matlab
drwxr-xr-x - objc
drwxr-xr-x - pascal
drwxr-xr-x - perl
drwxr-xr-x - php
drwxr-xr-x - python
drwxr-xr-x - ruby
drwxr-xr-x - tex