Commit message (Expand) | Author | Age | |
---|---|---|---|
* | merge-tree: don't print entries that match "local" | John Keeping | 2013-04-08 |
* | merge-tree: fix typo in merge-tree.c::unresolved | John Keeping | 2013-03-27 |
* | merge-tree: fix d/f conflicts | Junio C Hamano | 2012-12-26 |
* | merge-tree: add comments to clarify what these functions are doing | Junio C Hamano | 2012-12-26 |
* | merge-tree: lose unused "resolve_directories" | Junio C Hamano | 2012-12-26 |
* | merge-tree: lose unused "flags" from merge_list | Junio C Hamano | 2012-12-26 |
* | Which merge_file() function do you mean? | Junio C Hamano | 2012-12-09 |
* | sparse: Fix an "symbol 'merge_file' not decared" warning | Ramsay Jones | 2011-04-11 |
* | Fix sparse warnings | Stephen Boyd | 2011-03-22 |
* | merge-tree: fix where two branches share no changes | Will Palmer | 2010-07-14 |
* | Merge branch 'rs/diff-no-minimal' into maint | Junio C Hamano | 2010-06-21 |
* | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 2010-02-22 |