summaryrefslogtreecommitdiffstats
path: root/tests/resources/merge-resolve/changed-in-branch.txt
blob: ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b (plain)
1
initial revision