Google Git
Sign in
eclipse / platform / eclipse.platform.team / c30c4659a4035427b0d88995c40249cbd9f59a71 / . / bundles / org.eclipse.compare / plugins / org.eclipse.compare / compare / org / eclipse / compare / internal / previewAncestor.txt
blob: fbc5599cd8b244739b814b6469967d34347fc2a4 [file] [log] [blame]
1
2
3
conflict
4
5