| commit | e5f2114530046be50ef7d85cd595dbd37fc58e42 | |
| author | Arthur Daussy <arthur.daussy@obeo.fr> | |
| Fri, 4 May 2018 13:18:46 +0000 (4 15:18 +0200) | ||
| committer | Laurent Goubet <laurent.goubet@obeo.fr> | |
| Mon, 4 Jun 2018 15:00:29 +0000 (4 11:00 -0400) | ||
| tree | 5e40aeedd50ab822f0b6e62ee7402e66fc23c3eb | treesnapshot (tar.gz zip) |
| parent | f532d524682a7fb3c8c1b52483dd6ed52ca5708b | commitdiff |
[534365] Fix RecursiveModelMerger for "binary" git attributes
Properly sets up the TreeWalk in indexModelMergedFiles so it can access
Git attributes.
Bug: 534365
Change-Id: Ib4dd97c995bfa79d180f0a661a64a6ab5675e8ad
Properly sets up the TreeWalk in indexModelMergedFiles so it can access
Git attributes.
Bug: 534365
Change-Id: Ib4dd97c995bfa79d180f0a661a64a6ab5675e8ad
| plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/RecursiveModelMerger.java | diffblobblamehistory |