| commit | 0e69c63774ee07f75b23cbc3ad39e18dea31b528 | |
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | |
| Tue, 29 Jan 2013 22:10:37 +0000 (29 17:10 -0500) | ||
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | |
| Tue, 29 Jan 2013 22:10:37 +0000 (29 17:10 -0500) | ||
| tree | 58df30b9dfdf52dfdce03fde0279c9c940d9a0e3 | treesnapshot (tar.gz zip) |
| parent | 87866c4954d029566ceeb2f568f32ff7bddccc41 | commitdiff |
| parent | 02d004ce5221e2707b2311e95376550dd78a6785 | commitdiff |
Merge changes Ib9ac9ecd,I26dbc133
* changes:
Make Merge Tool also usable for conflicts of unstashing
Add support for specific stage to IndexFileRevision
* changes:
Make Merge Tool also usable for conflicts of unstashing
Add support for specific stage to IndexFileRevision