summaryrefslogtreecommitdiffstats
path: root/tests/resources/merge-resolve/unchanged.txt
blob: c8f06f2e3bb2964174677e91f0abead0e43c9e5d (plain) 
1

this file is unchanged in both
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-03 20:59:48 +0000