summaryrefslogtreecommitdiff
path: root/tests-clar/merge
Commit message (Expand)AuthorAgeFilesLines
* Rename tests-clar to testsBen Straub2013-11-1412-4055/+0
* Fix warningsRussell Belfer2013-11-131-1/+2
* Fix warning in tests-clar/merge/workdir/trivial.cLinquize2013-11-111-1/+1
* Plug git_merge() related leaksnulltoken2013-11-051-0/+2
* merge branch into current, updating workdirEdward Thomson2013-11-057-2/+1252
* Initial iconv hookup for precomposed unicodeRussell Belfer2013-10-031-1/+1
* Fix compilation warningsnulltoken2013-06-291-1/+1
* Reorganize diff and add basic diff driverRussell Belfer2013-06-101-1/+1
* merge setupEdward Thomson2013-05-171-15/+841
* Fix trailing whitespacesnulltoken2013-05-156-151/+149
* Fix win32 type warningsRussell Belfer2013-05-071-1/+1
* bracesEdward Thomson2013-05-021-180/+180
* puns are not funny; type punning especially soEdward Thomson2013-05-022-8/+5
* merge: Warning noiseVicent Marti2013-05-012-14/+3
* move NAME and REUC extensions to sys/Edward Thomson2013-04-302-0/+2
* renames!Edward Thomson2013-04-303-1/+614
* merge!Edward Thomson2013-04-307-10/+1248
* clar: fix merge/setup.cclar2Vicent Marti2013-01-041-21/+1
* MERGE_HEAD contents iteratorEdward Thomson2013-01-041-0/+159