3 Commits (5e2c08c6f0209e94b36d0770abae1a2b571cb0f1)

Author SHA1 Message Date
Junio C Hamano 153920da5b Custom low-level merge driver: change the configuration scheme. 18 years ago
Junio C Hamano f3ef6b6bbe Custom low-level merge driver support. 18 years ago
Junio C Hamano 47579efc00 Add a demonstration/test of customized merge. 18 years ago