aboutsummaryrefslogtreecommitdiff
path: root/t/conflicts.t
Commit message (Expand)AuthorAge
* Standardize on --long-option instead of -long-optionSimon McVittie2015-03-01
* another class of conflicts: subdir/file conflictsJoey Hess2010-07-18
* 2 more casesJoey Hess2010-07-18
* avoid error if two source files render the same destination fileJoey Hess2010-07-18
* some other (similar) failure casesJoey Hess2010-07-18
* updateJoey Hess2010-07-17
* turning into complete source file conflict test suiteJoey Hess2010-07-17