summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
Commit message (Expand)AuthorAgeFilesLines
* Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin2006-12-061-0/+116