| commit | 61df78ddbc8f3059aa38a6b86c0f73de0f333582 | |
| author | Arthur Daussy <arthur.daussy@obeo.fr> | |
| Wed, 24 Jan 2018 15:17:09 +0000 (24 16:17 +0100) | ||
| committer | Laurent Goubet <laurent.goubet@obeo.fr> | |
| Wed, 24 Jan 2018 16:23:25 +0000 (24 11:23 -0500) | ||
| tree | 94a3c936533930bd2a4bd46ca4547f103ffedb5c | treesnapshot (tar.gz zip) |
| parent | 4fa0e6f9c192c7d1ca23bdd2321e1628640081da | commitdiff |
[530250] Fix RecursiveModelMerger to be able to handle Git attributes
See org.eclipse.jgit.merge.ResolveMerger.mergeTreeWalk(TreeWalk,
boolean)
Bug : 530250
Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
Change-Id: Ifdd7dfc864b94fc0dbb4723d340fe607c500f5ae
See org.eclipse.jgit.merge.ResolveMerger.mergeTreeWalk(TreeWalk,
boolean)
Bug : 530250
Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
Change-Id: Ifdd7dfc864b94fc0dbb4723d340fe607c500f5ae
| plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/RecursiveModelMerger.java | diffblobblamehistory |