summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
Commit message (Expand)AuthorAgeFilesLines
* Get rid of the dependency to GNU diff in the testsJohannes Schindelin2007-03-041-4/+4
* Replace "echo -n" with printf in shell scripts.Jason Riedy2007-01-151-1/+1
* xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin2006-12-281-0/+22
* Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin2006-12-061-0/+116