Git 2.4

1. d687839 merge-blobs.c: fix a memleak by Stefan Beller · 11 years ago
2. fa2364e Which merge_file() function do you mean? by Junio C Hamano · 13 years ago[Renamed (94%) from merge-file.c]
3. 1e0f8c4 sparse: Fix an "symbol 'merge_file' not decared" warning by Ramsay Jones · 15 years ago
4. 712516b ll-merge: replace flag argument with options struct by Jonathan Nieder · 15 years ago
5. 39b5977 Merge branch 'rs/diff-no-minimal' by Junio C Hamano · 16 years ago
6. 582aa00 git diff too slow for a file by René Scharfe · 16 years ago
7. e44b385 merge_file(): add comment explaining behavior wrt conflict style by Jonathan Nieder · 16 years ago
8. f01de62 ll_merge(): add ancestor label parameter for diff3-style output by Jonathan Nieder · 16 years ago
9. 15b4f7a merge-tree: use ll_merge() not xdl_merge() by Junio C Hamano · 16 years ago
10. 00f8f97 xdl_merge(): introduce xmparam_t for merge specific parameters by Junio C Hamano · 16 years ago
11. 9ccd0a8 Always initialize xpparam_t to 0 by Brian Downing · 17 years ago
12. c279d7e xdl_diff: identify call sites. by Junio C Hamano · 18 years ago
13. 30b2501 Future-proof source for changes in xdemitconf_t by Johannes Schindelin · 18 years ago
14. 21666f1 convert object type handling from a string to a number by Nicolas Pitre · 19 years ago
15. e2b7008 Get rid of the dependency on RCS' merge program by Johannes Schindelin · 19 years ago
16. 9befac4 Replace uses of strdup with xstrdup. by Shawn Pearce · 19 years ago
17. 0c79938 Improved three-way blob merging code by Linus Torvalds · 19 years ago