Log - 565e135a1e5fc393f764415a4724f43cc07f4da6 - jrn/git

4c73480 conflict-marker-size: add test and docs by Junio C Hamano · 15 years ago
ed520a8 Merge branch 'mv/merge-recursive' by Shawn O. Pearce · 16 years ago
4271666 builtin-merge: release the lockfile in try_merge_strategy() by Miklos Vajna · 17 years ago
3604e7c tests: use "git xyzzy" form (t3600 - t6999) by Nanako Shiraishi · 17 years ago
153920d Custom low-level merge driver: change the configuration scheme. by Junio C Hamano · 18 years ago
f3ef6b6 Custom low-level merge driver support. by Junio C Hamano · 18 years ago
47579ef Add a demonstration/test of customized merge. by Junio C Hamano · 18 years ago