![]() Respect merge=lfs and diff=lfs attributes where required to replace (in memory) the content of LFS pointers with the actual blob content from the LFS storage (and vice versa when staging/merging). Does not implement general support for merge/diff attributes for any other use case apart from LFS. Change-Id: Ibad8875de1e0bee8fe3a1dffb1add93111534cae Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> |
||
---|---|---|
.. | ||
.api_filters | ||
org.eclipse.core.resources.prefs | ||
org.eclipse.core.runtime.prefs | ||
org.eclipse.jdt.core.prefs | ||
org.eclipse.jdt.ui.prefs | ||
org.eclipse.mylyn.tasks.ui.prefs | ||
org.eclipse.mylyn.team.ui.prefs | ||
org.eclipse.pde.api.tools.prefs | ||
org.eclipse.pde.core.prefs |