summaryrefslogtreecommitdiff
path: root/test/conflict1.expect
blob: 03c6d6701436199c6ce24a595f7bccecc559d333 (plain) (blame)
1
2
Installing b (2)
Installing a (1)