| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | Simplify some instances of run_command() by using run_command_v_opt(). | Johannes Sixt | 2009-06-09 |
| * | replace direct calls to unlink(2) with unlink_or_warn | Alex Riesen | 2009-04-29 |
| * | merge-recursive: use strbuf_expand() instead of interpolate() | René Scharfe | 2008-11-23 |
| * | git-merge-recursive: learn to honor merge.conflictstyle | Junio C Hamano | 2008-08-30 |
| * | Provide git_config with a callback-data parameter | Johannes Schindelin | 2008-05-14 |
| * | merge-recursive: split low-level merge functions out. | Junio C Hamano | 2008-02-18 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/ll-merge.c