summaryrefslogtreecommitdiff
path: root/t/t5515-fetch-merge-logic.sh
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'js/diff-ni'Junio C Hamano2007-03-101-1/+1
| | | | | | | | * js/diff-ni: Get rid of the dependency to GNU diff in the tests diff --no-index: support /dev/null as filename diff-ni: fix the diff with standard input diff: support reading a file from stdin via "-"
* t/t5515-fetch-merge-logic.sh: Add two more testsSanti B,Ai(Bjar2007-03-071-0/+1
| | | | | | | They test the behaviour with just a URL in the command line. Signed-off-by: Santi B,Ai(Bjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetchSanti Béjar2007-03-051-0/+161
Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>