| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | another class of conflicts: subdir/file conflicts | Joey Hess | 2010-07-18 |
| | | |||
| * | 2 more cases | Joey Hess | 2010-07-18 |
| | | |||
| * | avoid error if two source files render the same destination file | Joey Hess | 2010-07-18 |
| | | | | | | | | There are two sub-caces. If both source files still exist, the winner that renders the destination file is undefined. If one source file is deleted and the other added, in a refresh, the new file will take over the destination file. | ||
| * | some other (similar) failure cases | Joey Hess | 2010-07-18 |
| | | |||
| * | update | Joey Hess | 2010-07-17 |
| | | |||
| * | turning into complete source file conflict test suite | Joey Hess | 2010-07-17 |