summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/removed-in-branch.txt
blob: dfe3f22baa1f6fce5447901c3086bae368de6bdd (plain)
1
this is removed in branch