summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/conflicting.txt
blob: 4e886e602529caa9ab11d71f86634bd1b6e0de10 (plain)
1
this file is changed in master and branch