| Age | Commit message (Expand) | Author |
|---|---|---|
| 2005-11-02 | print RCS file path; | Xavier Santolaria |
| 2005-11-02 | sync with Reality; | Xavier Santolaria |
| 2005-10-26 | diff3_conflicts cleanup; joris ok | Xavier Santolaria |
| 2005-10-23 | add extern int diff3_conflicts to unbreak. bad joris. | Niall O'Higgins |
| 2005-10-23 | correct error message; | Xavier Santolaria |
| 2005-10-23 | warn if conflicts were found during the merge; | Joris Vink |
| 2005-10-23 | with recent diff3 support, rcsmerge now works; | Joris Vink |
| 2005-10-18 | skeletons for rcsmerge(1); | Xavier Santolaria |
 |
index : src | |
| OpenBSD base system |
| summaryrefslogtreecommitdiff |