summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
AgeCommit message (Expand)Author
2006-12-06Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin