aboutsummaryrefslogtreecommitdiff
path: root/t/t6022-merge-rename.sh
Commit message (Expand)AuthorAge
* read-tree -m -u: do not overwrite or remove untracked working tree files.Junio C Hamano2006-05-17
* Optionally work without pythonJohannes Schindelin2006-02-18
* merge-recursive: conflicting rename case.Junio C Hamano2005-12-21
* t/t6022: a new test for renaming merge.Junio C Hamano2005-12-11