rebase: show consistent conflict resolution hint
[gitweb.git] / t / t4034 /
drwxr-xr-x   parent (dest: t; base: 89c7ae9c3bffe599b46a18a9a504fd3e28a9e715)
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 - 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