summaryrefslogtreecommitdiff
path: root/t/t6200-fmt-merge-msg.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/maint-1.6.2-opt-filename-fix'Junio C Hamano2009-05-291-0/+32
|\
| * apply, fmt-merge-msg: use relative filenamesStephen Boyd2009-05-231-0/+32
* | Tests on Windows: $(pwd) must return Windows-style pathsJohannes Sixt2009-03-191-2/+2
|/
* tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano2008-08-171-2/+2
* tests: do not use implicit "git diff --no-index"Junio C Hamano2008-05-241-8/+8
* Merge branch 'bd/tests'Junio C Hamano2008-05-141-3/+3
|\
| * Rename the test trash directory to contain spaces.Bryan Donlan2008-05-051-3/+3
* | fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableSZEDER Gábor2008-04-121-3/+51
|/
* Get rid of the dependency to GNU diff in the testsJohannes Schindelin2007-03-041-5/+5
* [PATCH] Rename git-repo-config to git-config.Tom Prince2007-01-281-3/+3
* t6200: fmt-merge-msg test.Junio C Hamano2006-07-031-0/+163