summaryrefslogtreecommitdiff
path: root/src/merge.c
Commit message (Expand)AuthorAgeFilesLines
* update copyrightsEdward Thomson2013-01-081-1/+1
* merge cleanup should actually cleanup and the test should actually testEdward Thomson2013-01-061-1/+1
* MERGE_HEAD contents iteratorEdward Thomson2013-01-031-0/+53
* expose merge metadata cleanupEdward Thomson2013-01-031-1/+1
* Fix function name and add real error checkRussell Belfer2012-11-291-4/+4
* Rename git_count_ahead_behind -> git_graph_ahead_behindScott J. Goldman2012-11-281-82/+0
* fix coding style: while( -> while (Scott J. Goldman2012-11-281-1/+1
* Add initial implementation of ahead-behind countScott J. Goldman2012-11-281-0/+81
* Move merge functions to merge.cBen Straub2012-11-271-0/+196
* reset changes for mergeEdward Thomson2012-10-241-0/+48