summaryrefslogtreecommitdiffstats
path: root/src/merge.c
Commit message (Collapse)AuthorAgeFilesLines
* compile with fascist gcc warnings and fix all issues foundLennart Poettering2006-04-221-0/+1
| | | | git-svn-id: file:///home/lennart/svn/public/syrep/trunk@103 07ea20a6-d2c5-0310-9e02-9ef735347d72
* If a file already exists, and the user chooses not to replace it, don't ↵Lennart Poettering2006-04-171-3/+5
| | | | | | treat this as an error git-svn-id: file:///home/lennart/svn/public/syrep/trunk@98 07ea20a6-d2c5-0310-9e02-9ef735347d72
* * cleanup trash recursivelyLennart Poettering2005-06-051-1/+1
| | | | | | | | | | | | * ignore some more files * compile as C99 with -pedantic * upgrade to Berkeley DB 4.3 * add some tests for rm_rf() and copy_fd() * remove some minor warnings * minor fixes git-svn-id: file:///home/lennart/svn/public/syrep/trunk@76 07ea20a6-d2c5-0310-9e02-9ef735347d72
* assorted stuffLennart Poettering2004-12-031-16/+42
| | | | git-svn-id: file:///home/lennart/svn/public/syrep/trunk@75 07ea20a6-d2c5-0310-9e02-9ef735347d72
* prepare for next releaseLennart Poettering2004-10-141-36/+11
| | | | git-svn-id: file:///home/lennart/svn/public/syrep/trunk@71 07ea20a6-d2c5-0310-9e02-9ef735347d72
* relase 0.3Lennart Poettering2003-11-301-18/+64
| | | | | | | | | | --copy-always --sort bi-directory merges --check-md git-svn-id: file:///home/lennart/svn/public/syrep/trunk@43 07ea20a6-d2c5-0310-9e02-9ef735347d72
* prepared for release 0.2Lennart Poettering2003-09-091-6/+9
| | | | git-svn-id: file:///home/lennart/svn/public/syrep/trunk@38 07ea20a6-d2c5-0310-9e02-9ef735347d72
* Many fixes, primarily documentationLennart Poettering2003-09-071-2/+6
| | | | git-svn-id: file:///home/lennart/svn/public/syrep/trunk@32 07ea20a6-d2c5-0310-9e02-9ef735347d72
* filename hashing implementedLennart Poettering2003-08-311-4/+22
| | | | git-svn-id: file:///home/lennart/svn/public/syrep/trunk@19 07ea20a6-d2c5-0310-9e02-9ef735347d72
* many fixesLennart Poettering2003-08-291-51/+80
| | | | | | | --cleanup implemented git-svn-id: file:///home/lennart/svn/public/syrep/trunk@13 07ea20a6-d2c5-0310-9e02-9ef735347d72
* added copyright noticeLennart Poettering2003-08-281-0/+20
| | | | git-svn-id: file:///home/lennart/svn/public/syrep/trunk@12 07ea20a6-d2c5-0310-9e02-9ef735347d72
* directory merge fixesLennart Poettering2003-08-281-12/+117
| | | | git-svn-id: file:///home/lennart/svn/public/syrep/trunk@10 07ea20a6-d2c5-0310-9e02-9ef735347d72
* implemented merging an patch makingLennart Poettering2003-08-281-17/+52
| | | | git-svn-id: file:///home/lennart/svn/public/syrep/trunk@9 07ea20a6-d2c5-0310-9e02-9ef735347d72
* Initial commitLennart Poettering2003-08-261-0/+132
git-svn-id: file:///home/lennart/svn/public/syrep/trunk@2 07ea20a6-d2c5-0310-9e02-9ef735347d72
generated by cgit (git 2.34.1) at 2025-06-27 08:11:17 +0000