gitweb: avoid naming my/ours naming conflict
[git/gitweb.git] / contrib / 
treed57347611cccb75b4616a619d32041b17d20cd72
drwxr-xr-x   ..
-rw-r--r-- 2113 README
drwxr-xr-x - buildsystems
drwxr-xr-x - completion
drwxr-xr-x - contacts
-rwxr-xr-x 751 convert-grafts-to-replace-refs.sh
drwxr-xr-x - convert-objects
drwxr-xr-x - credential
drwxr-xr-x - diff-highlight
drwxr-xr-x - emacs
drwxr-xr-x - examples
drwxr-xr-x - fast-import
drwxr-xr-x - git-jump
-rwxr-xr-x 4407 git-resurrect.sh
drwxr-xr-x - git-shell-commands
drwxr-xr-x - gitview
drwxr-xr-x - hg-to-git
drwxr-xr-x - hooks
drwxr-xr-x - mw-to-git
drwxr-xr-x - persistent-https
drwxr-xr-x - remote-helpers
-rwxr-xr-x 770 remotes2config.sh
-rwxr-xr-x 1009 rerere-train.sh
drwxr-xr-x - stats
drwxr-xr-x - subtree
drwxr-xr-x - svn-fe
drwxr-xr-x - thunderbird-patch-inline
drwxr-xr-x - workdir