Test the conflict diff email.
[git-central.git] / server /
drwxr-xr-x   ..
-rw-r--r-- 5055 functions
-rw-r--r-- 12 noop
-rwxr-xr-x 13602 post-receive-email
-rw-r--r-- 659 post-receive-git-config
-rw-r--r-- 542 post-receive-trac
-rw-r--r-- 1975 post-receive-trac.py
-rw-r--r-- 282 pre-receive-only-one
-rw-r--r-- 1829 pre-receive-trac.py
-rw-r--r-- 3054 update-allow-tags-branches
-rw-r--r-- 1346 update-ensure-follows
-rw-r--r-- 3429 update-ensure-merged
-rw-r--r-- 664 update-ensure-tag-in-branch
-rw-r--r-- 1054 update-ensure-ticket-reference
-rwxr-xr-x 935 update-lock-check.rb
-rw-r--r-- 2666 update-prefer-rebase
-rw-r--r-- 588 update-prefer-underscores
-rw-r--r-- 4907 update-stable