summaryrefslogtreecommitdiff
path: root/tests/merge
Commit message (Expand)AuthorAgeFilesLines
* maint: update copyright date year ranges to include 2011Jim Meyering2011-03-271-1/+1
* maint: avoid non-portable use of test -aJim Meyering2011-03-261-1/+1
* More test suite fixesAndreas Gruenbacher2010-05-051-0/+1
* Some test suite fixes and improvementsAndreas Gruenbacher2010-05-041-1/+1
* Portability fixes in the test suiteAndreas Gruenbacher2010-04-151-31/+30
* Merge: detect already-applied inserts at the end of filesAndreas Gruenbacher2010-02-211-0/+30
* * src/patch.c (longopts, get_some_switches): Add an optional argumentAndreas Gruenbacher2009-12-291-3/+289
* Clarify the message when (part of) a hunk cannot be mergedAndreas Gruenbacher2009-10-271-16/+16
* The -m option hasn't been officially allocated yet; use only the long form fo...Andreas Gruenbacher2009-07-191-1/+1
* Make the ed utility optional in the test suiteAndreas Gruenbacher2009-04-031-43/+37
* Another minor merge message improvementAndreas Gruenbacher2009-04-031-2/+4
* Slightly improved merge result reportingAndreas Gruenbacher2009-04-031-25/+16
* Fix two failed assertions in merge_hunk()Andreas Gruenbacher2009-04-021-3/+29
* The maximum position for a merge was computed too lowAndreas Gruenbacher2009-04-021-0/+30
* Add better merge supportAndreas Gruenbacher2009-04-021-17/+8
* Locate hunks to merge more intelligentlyAndreas Gruenbacher2009-04-021-22/+14
* Add a simple form of merge supportAndreas Gruenbacher2009-04-021-0/+316
View Lorry Controller Status