t3508 (cherry-pick): futureproof against unmerged files
[git/jrn.git] / contrib / 
tree590f8ed07a621226a758834fb6ed98bdaf5f1a91
drwxr-xr-x   ..
-rw-r--r-- 2113 README
drwxr-xr-x - blameview
drwxr-xr-x - buildsystems
drwxr-xr-x - ciabot
drwxr-xr-x - completion
drwxr-xr-x - continuous
drwxr-xr-x - convert-objects
drwxr-xr-x - emacs
drwxr-xr-x - examples
drwxr-xr-x - fast-import
-rwxr-xr-x 4388 git-resurrect.sh
drwxr-xr-x - gitview
drwxr-xr-x - hg-to-git
drwxr-xr-x - hooks
drwxr-xr-x - p4import
drwxr-xr-x - patches
-rwxr-xr-x 770 remotes2config.sh
-rwxr-xr-x 990 rerere-train.sh
drwxr-xr-x - stats
drwxr-xr-x - thunderbird-patch-inline
drwxr-xr-x - vim
drwxr-xr-x - workdir