Documentation: Add definition of "evil merge" to GIT Glossary
[git/mergetool.git] / contrib / 
tree7130dda988e3dff3013dcc1c51da9a4d880b0dba
drwxr-xr-x   ..
-rw-r--r-- 2114 README
drwxr-xr-x - blameview
drwxr-xr-x - completion
drwxr-xr-x - continuous
drwxr-xr-x - emacs
drwxr-xr-x - examples
drwxr-xr-x - fast-import
drwxr-xr-x - gitview
drwxr-xr-x - hg-to-git
drwxr-xr-x - hooks
-rw-r--r-- 759 remotes2config.sh
drwxr-xr-x - vim
drwxr-xr-x - workdir