summaryrefslogtreecommitdiff
path: root/t/t1004-read-tree-m-u-wf.sh
Commit message (Expand)AuthorAgeFilesLines
* tests: A SANITY test prereq for testing if we're rootÆvar Arnfjörð Bjarmason2010-08-181-1/+1
* Use prerequisite tags to skip tests that depend on symbolic linksJohannes Sixt2009-03-221-3/+3
* Fix read-tree not to discard errorsJunio C Hamano2008-03-181-1/+1
* Add tests to catch problems with un-unlinkable symlinksJunio C Hamano2008-03-181-0/+35
* git-merge-one-file: fix longstanding stupid thinkoJunio C Hamano2008-03-181-0/+46
* Don't update unchanged merge entriesLinus Torvalds2008-03-161-0/+41
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-1/+1
* Assorted typo fixesPavel Roskin2007-02-031-1/+1
* read-tree: further loosen "working file will be lost" check.Junio C Hamano2006-12-051-8/+74
* merge: loosen overcautious "working file will be lost" check.Junio C Hamano2006-10-271-0/+53