summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
...
* merge-recur: Cleanup last mixedCase variables...Johannes Schindelin2006-07-271-23/+23
* merge-recur: Fix compiler warning with -pedanticJohannes Schindelin2006-07-271-1/+4
* merge-recur: Remove dead codeJohannes Schindelin2006-07-271-22/+0
* merge-recur: Get rid of debug codeJohannes Schindelin2006-07-271-64/+1
* merge-recur: Convert variable names to lower_caseJohannes Schindelin2006-07-271-191/+189
* Cumulative update of merge-recursive in CJohannes Schindelin2006-07-271-526/+364
* Merge branch 'lt/unitype' into js/c-merge-recursiveJunio C Hamano2006-07-131-1/+1
* Status update on merge-recursive in CJohannes Schindelin2006-07-131-0/+1560