diff options
| author | Markus Duft | 2012-07-13 06:25:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2013-01-12 01:32:44 +0000 |
| commit | baf7ca9cc0d2bdf237a9bb19486d6fde5250a7f5 (patch) | |
| tree | 0a9d7f0fa4037f6b8f25f97fbf106c3663b80f56 /LICENSE | |
| parent | 912ef3da19c7bc1975805e1e3e9746baf479c2be (diff) | |
| download | jgit-baf7ca9cc0d2bdf237a9bb19486d6fde5250a7f5.tar.gz jgit-baf7ca9cc0d2bdf237a9bb19486d6fde5250a7f5.tar.xz jgit-baf7ca9cc0d2bdf237a9bb19486d6fde5250a7f5.zip | |
Improve handling of checkout conflicts
This converts a checkout conflict exception into a RebaseResult /
MergeResult containing the conflicting paths, which enables EGit (or
others) to handle the situation in a user-friendly way
Change-Id: I48d9bdcc1e98095576513a54a225a42409f301f3
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions