aboutsummaryrefslogtreecommitdiff
path: root/merge-file.c
Commit message (Expand)AuthorAge
* sparse: Fix an "symbol 'merge_file' not decared" warningRamsay Jones2011-04-11
* ll-merge: replace flag argument with options structJonathan Nieder2010-08-26
* Merge branch 'rs/diff-no-minimal'Junio C Hamano2010-06-13
|\
| * git diff too slow for a fileRené Scharfe2010-05-02
* | merge_file(): add comment explaining behavior wrt conflict styleJonathan Nieder2010-03-20
* | ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-20
|/
* merge-tree: use ll_merge() not xdl_merge()Junio C Hamano2010-01-16
* xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-16
* Always initialize xpparam_t to 0Brian Downing2008-10-25
* xdl_diff: identify call sites.Junio C Hamano2007-12-13
* Future-proof source for changes in xdemitconf_tJohannes Schindelin2007-07-06
* convert object type handling from a string to a numberNicolas Pitre2007-02-27
* Get rid of the dependency on RCS' merge programJohannes Schindelin2006-12-12
* Replace uses of strdup with xstrdup.Shawn Pearce2006-09-02
* Improved three-way blob merging codeLinus Torvalds2006-06-28
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-01 17:23:13 +0000