GIT v1.6.4-rc1

1. dd787c1 Merge branch 'tr/die_errno' by Junio C Hamano · 16 years ago
2. 606475f Remove filename from conflict markers by Martin Renold · 16 years ago
3. 0721c31 Use die_errno() instead of die() when checking syscalls by Thomas Rast · 16 years ago
4. 09236d8 Merge branch 'sb/maint-1.6.0-add-config-fix' by Junio C Hamano · 16 years ago
5. 90dce51 use xstrdup, not strdup in ll-merge.c by Jim Meyering · 17 years ago
6. 0077138 Simplify some instances of run_command() by using run_command_v_opt(). by Johannes Sixt · 17 years ago
7. 691f1a2 replace direct calls to unlink(2) with unlink_or_warn by Alex Riesen · 17 years ago
8. ced621b merge-recursive: use strbuf_expand() instead of interpolate() by René Scharfe · 17 years ago
9. c236bcd git-merge-recursive: learn to honor merge.conflictstyle by Junio C Hamano · 17 years ago
10. ef90d6d Provide git_config with a callback-data parameter by Johannes Schindelin · 18 years ago
11. 525ab63 merge-recursive: split low-level merge functions out. by Junio C Hamano · 18 years ago