summaryrefslogtreecommitdiff
path: root/tests-clar/resources/merge-resolve/unchanged.txt
blob: c8f06f2e3bb2964174677e91f0abead0e43c9e5d (plain)
1
this file is unchanged in both