Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge branch into current, updating workdir | Edward Thomson | 2013-11-05 | 1 | -0/+11 |
* | move mode_t to filebuf_open instead of _commit | Edward Thomson | 2013-11-04 | 1 | -0/+1 |
* | merge setup | Edward Thomson | 2013-05-17 | 1 | -0/+22 |
* | Fix trailing whitespaces | nulltoken | 2013-05-15 | 1 | -18/+18 |
* | Unify whitespaces to tabs | Linquize | 2013-05-15 | 1 | -14/+14 |
* | merge! | Edward Thomson | 2013-04-30 | 1 | -5/+110 |
* | update copyrights | Edward Thomson | 2013-01-08 | 1 | -1/+1 |
* | MERGE_HEAD contents iterator | Edward Thomson | 2013-01-03 | 1 | -0/+1 |
* | expose merge metadata cleanup | Edward Thomson | 2013-01-03 | 1 | -1/+0 |
* | Move merge functions to merge.c | Ben Straub | 2012-11-27 | 1 | -0/+3 |
* | reset changes for merge | Edward Thomson | 2012-10-24 | 1 | -0/+19 |