Code

Merge branch 'js/read-tree' into js/c-merge-recursive
[git.git] / merge-recursive.c
2006-07-31 Junio C HamanoMerge branch 'js/read-tree' into js/c-merge-recursive
2006-07-30 Johannes Schindelinmerge-recur: fix thinko in unique_path()
2006-07-28 Johannes Schindelinmerge-recur: Explain why sha_eq() and struct stage_data...
2006-07-28 Johannes Schindelinmerge-recur: Cleanup last mixedCase variables...
2006-07-28 Johannes Schindelinmerge-recur: Fix compiler warning with -pedantic
2006-07-28 Johannes Schindelinmerge-recur: Remove dead code
2006-07-28 Johannes Schindelinmerge-recur: Get rid of debug code
2006-07-28 Johannes Schindelinmerge-recur: Convert variable names to lower_case
2006-07-28 Johannes SchindelinCumulative update of merge-recursive in C
2006-07-14 Junio C HamanoMerge branch 'lt/unitype' into js/c-merge-recursive
2006-07-14 Johannes SchindelinStatus update on merge-recursive in C