summaryrefslogtreecommitdiff
path: root/src/merge_file.h
Commit message (Expand)AuthorAgeFilesLines
* Introduce git_merge_file for consumersEdward Thomson2014-03-201-78/+0
* Introduce diff3 mode for checking out conflictsEdward Thomson2014-01-201-0/+9
* merge_file should use more aggressive levelsEdward Thomson2014-01-201-1/+13
* Fix trailing whitespacesnulltoken2013-05-151-3/+3
* merge!Edward Thomson2013-04-301-0/+71