summaryrefslogtreecommitdiff
path: root/merge-file.c
Commit message (Expand)AuthorAgeFilesLines
* sparse: Fix an "symbol 'merge_file' not decared" warningRamsay Jones2011-04-111-0/+1
* ll-merge: replace flag argument with options structJonathan Nieder2010-08-261-1/+1
* Merge branch 'rs/diff-no-minimal'Junio C Hamano2010-06-131-1/+1
|\
| * git diff too slow for a fileRené Scharfe2010-05-021-1/+1
* | merge_file(): add comment explaining behavior wrt conflict styleJonathan Nieder2010-03-201-0/+6
* | ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-201-1/+1
|/
* merge-tree: use ll_merge() not xdl_merge()Junio C Hamano2010-01-161-9/+7
* xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-161-3/+3
* Always initialize xpparam_t to 0Brian Downing2008-10-251-0/+1
* xdl_diff: identify call sites.Junio C Hamano2007-12-131-1/+1
* Future-proof source for changes in xdemitconf_tJohannes Schindelin2007-07-061-0/+1
* convert object type handling from a string to a numberNicolas Pitre2007-02-271-5/+5
* Get rid of the dependency on RCS' merge programJohannes Schindelin2006-12-121-62/+13
* Replace uses of strdup with xstrdup.Shawn Pearce2006-09-021-1/+1
* Improved three-way blob merging codeLinus Torvalds2006-06-281-0/+166