Display 'theirs' branch name when possible in merge.
[git/dscho.git] / gitweb / 
tree60e2d04ed48ef9d017e018f163bd455aa09cc904
drwxr-xr-x   ..
-rw-r--r-- 3144 README
-rw-r--r-- 164 git-favicon.png
-rw-r--r-- 208 git-logo.png
-rw-r--r-- 6574 gitweb.css
-rwxr-xr-x 136701 gitweb.perl
drwxr-xr-x - test