summaryrefslogtreecommitdiff
path: root/src/merge_file.c
Commit message (Expand)AuthorAgeFilesLines
* checkout (from index) can write conflictsEdward Thomson2013-10-161-1/+1
* Fix trailing whitespacesnulltoken2013-05-151-24/+23
* merge!Edward Thomson2013-04-301-0/+175