advice: Introduce error_resolve_conflict
[gitweb.git] / templates /
drwxr-xr-x   parent (dest: ; base: 38ef61cfde8aea0864e898d37ce3213a5771c59e)
-rw-r--r-- 1750 Makefile
-rw-r--r-- 47 branches--
-rwxr-xr-x 452 hooks--applypatch-msg.sample
-rwxr-xr-x 896 hooks--commit-msg.sample
-rwxr-xr-x 160 hooks--post-commit.sample
-rwxr-xr-x 552 hooks--post-receive.sample
-rwxr-xr-x 189 hooks--post-update.sample
-rwxr-xr-x 398 hooks--pre-applypatch.sample
-rwxr-xr-x 1578 hooks--pre-commit.sample
-rwxr-xr-x 4949 hooks--pre-rebase.sample
-rwxr-xr-x 1235 hooks--prepare-commit-msg.sample
-rwxr-xr-x 3611 hooks--update.sample
-rw-r--r-- 240 info--exclude
-rw-r--r-- 73 this--description