diff options
| author | Laurent Goubet <laurent.goubet@obeo.fr> | 2014-01-21 16:35:26 +0100 |
|---|---|---|
| committer | Laurent Goubet <laurent.goubet@obeo.fr> | 2014-05-06 16:30:34 +0200 |
| commit | 7424d58255340fa44d9191a7436fbe70d72a457c (patch) | |
| tree | 60fda160823e8adb1d2e580853e2603445dba45f /LICENSE | |
| parent | 3a47e45c3236e7045bcf81239cd1827c40a8ed73 (diff) | |
| download | jgit-7424d58255340fa44d9191a7436fbe70d72a457c.tar.gz jgit-7424d58255340fa44d9191a7436fbe70d72a457c.zip | |
Allow callers to use different merging strategies
Signed-off-by: Laurent Goubet <laurent.goubet@obeo.fr>
Change-Id: I84e9d7b4b772b4ad7d3e7010aad78291d4d178fe
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions