summaryrefslogtreecommitdiffstats
path: root/test/integration/mergeConflicts/expected/repo/cherrypicking2
blob: 889b0fdfe5f2ae3d7df3066f3bc1e181fa712c8d (plain)
1
this is file number 2 that I'm going to cherry-pick