summaryrefslogtreecommitdiff
path: root/t/t3402-rebase-merge.sh
Commit message (Expand)AuthorAgeFilesLines
* recur vs recursive: help testing without touching too many stuff.Junio C Hamano2006-07-131-1/+1
* Status update on merge-recursive in CJohannes Schindelin2006-07-131-1/+1
* rebase: error out for NO_PYTHON if they use recursive mergeEric Wong2006-06-211-0/+6
* Add renaming-rebase test.Junio C Hamano2006-06-211-0/+106