diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2013-04-06 14:03:24 +0200 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2013-04-08 05:48:09 -0400 |
| commit | 59baf9148e4b16028203d9e881136ab4c005202c (patch) | |
| tree | 6068f07e0faa8389a43c40f8b5ff72b7ffd2fbd9 /org.eclipse.jgit.test | |
| parent | 5d446f410d7044fba165ad3deee7ac83864f0e96 (diff) | |
| download | jgit-59baf9148e4b16028203d9e881136ab4c005202c.tar.gz jgit-59baf9148e4b16028203d9e881136ab4c005202c.zip | |
Detect and handle a checkout conflict during merge nicely
Report the conflicting files nicely and inform the user.
Change-Id: I75d464d4156d10c6cc6c7ce5a321e2c9fb0df375
Diffstat (limited to 'org.eclipse.jgit.test')
0 files changed, 0 insertions, 0 deletions