aboutsummaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
Commit message (Expand)AuthorAge
* Replace "echo -n" with printf in shell scripts.Jason Riedy2007-01-15
* xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin2006-12-28
* Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin2006-12-06