cherry-pick/revert: make direct internal call to merge_tree()
[git/mingw.git] / templates / 
treef8cdd03824eb1cc5679d08a5085912e81e519f41
drwxr-xr-x   ..
-rw-r--r-- 22 .gitignore
-rw-r--r-- 1341 Makefile
-rw-r--r-- 47 branches--
-rwxr-xr-x 452 hooks--applypatch-msg.sample
-rwxr-xr-x 894 hooks--commit-msg.sample
-rwxr-xr-x 160 hooks--post-commit.sample
-rwxr-xr-x 553 hooks--post-receive.sample
-rwxr-xr-x 189 hooks--post-update.sample
-rwxr-xr-x 398 hooks--pre-applypatch.sample
-rwxr-xr-x 519 hooks--pre-commit.sample
-rwxr-xr-x 4942 hooks--pre-rebase.sample
-rwxr-xr-x 1219 hooks--prepare-commit-msg.sample
-rwxr-xr-x 2892 hooks--update.sample
-rw-r--r-- 240 info--exclude
-rw-r--r-- 58 this--description