| Age | Commit message (Expand) | Author |
|---|---|---|
| 2010-06-13 | Merge branch 'rs/diff-no-minimal' | Junio C Hamano |
| 2010-05-02 | git diff too slow for a file | René Scharfe |
| 2010-03-20 | merge_file(): add comment explaining behavior wrt conflict style | Jonathan Nieder |
| 2010-03-20 | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder |
| 2010-01-16 | merge-tree: use ll_merge() not xdl_merge() | Junio C Hamano |
| 2010-01-16 | xdl_merge(): introduce xmparam_t for merge specific parameters | Junio C Hamano |
| 2008-10-25 | Always initialize xpparam_t to 0 | Brian Downing |
| 2007-12-13 | xdl_diff: identify call sites. | Junio C Hamano |
| 2007-07-06 | Future-proof source for changes in xdemitconf_t | Johannes Schindelin |
| 2007-02-27 | convert object type handling from a string to a number | Nicolas Pitre |
| 2006-12-12 | Get rid of the dependency on RCS' merge program | Johannes Schindelin |
| 2006-09-02 | Replace uses of strdup with xstrdup. | Shawn Pearce |
| 2006-06-28 | Improved three-way blob merging code | Linus Torvalds |
 |
index : user/sven/git.git | |
| Git | Sven Wegener |
| summaryrefslogtreecommitdiff |
path: root/merge-file.c