13 Commits (170a4814d382e79ea774813c99f12bb2a2922776)

Author SHA1 Message Date
Johannes Sixt 5709e0363a run_command: return exit code as positive value 16 years ago
Martin Renold 606475f317 Remove filename from conflict markers 16 years ago
Thomas Rast 0721c314a5 Use die_errno() instead of die() when checking syscalls 16 years ago
Jim Meyering 90dce51584 use xstrdup, not strdup in ll-merge.c 16 years ago
Johannes Sixt 0077138cd9 Simplify some instances of run_command() by using run_command_v_opt(). 16 years ago
Alex Riesen 691f1a28bf replace direct calls to unlink(2) with unlink_or_warn 16 years ago
René Scharfe ced621b2c1 merge-recursive: use strbuf_expand() instead of interpolate() 16 years ago
Junio C Hamano c236bcd061 git-merge-recursive: learn to honor merge.conflictstyle 16 years ago
Johannes Schindelin ef90d6d420 Provide git_config with a callback-data parameter 17 years ago
Junio C Hamano 525ab63950 merge-recursive: split low-level merge functions out. 17 years ago