equal
deleted
inserted
replaced
4933 % f) |
4933 % f) |
4934 continue |
4934 continue |
4935 |
4935 |
4936 if mark: |
4936 if mark: |
4937 if markcheck: |
4937 if markcheck: |
4938 with repo.wvfs(f) as fobj: |
4938 fdata = repo.wvfs.tryread(f) |
4939 fdata = fobj.read() |
|
4940 if filemerge.hasconflictmarkers(fdata) and \ |
4939 if filemerge.hasconflictmarkers(fdata) and \ |
4941 ms[f] != mergemod.MERGE_RECORD_RESOLVED: |
4940 ms[f] != mergemod.MERGE_RECORD_RESOLVED: |
4942 hasconflictmarkers.append(f) |
4941 hasconflictmarkers.append(f) |
4943 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED) |
4942 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED) |
4944 elif unmark: |
4943 elif unmark: |