Log - c0da5db1e692c2bc74e5cdba67baf8762ac304b4 - jrn/git

15b4f7a merge-tree: use ll_merge() not xdl_merge() by Junio C Hamano · 15 years ago
00f8f97 xdl_merge(): introduce xmparam_t for merge specific parameters by Junio C Hamano · 15 years ago
9ccd0a8 Always initialize xpparam_t to 0 by Brian Downing · 16 years ago
c279d7e xdl_diff: identify call sites. by Junio C Hamano · 17 years ago
30b2501 Future-proof source for changes in xdemitconf_t by Johannes Schindelin · 18 years ago
21666f1 convert object type handling from a string to a number by Nicolas Pitre · 18 years ago
e2b7008 Get rid of the dependency on RCS' merge program by Johannes Schindelin · 18 years ago
9befac4 Replace uses of strdup with xstrdup. by Shawn Pearce · 19 years ago
0c79938 Improved three-way blob merging code by Linus Torvalds · 19 years ago