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.pgm/resources | |
| 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.pgm/resources')
| -rw-r--r-- | org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties index eed05e89f5..07d9c00c7e 100644 --- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties +++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties @@ -65,7 +65,9 @@ jgitVersion=jgit version {0} lineFormat=# {0} listeningOn=Listening on {0} mergeConflict=CONFLICT(content): Merge conflict in {0} +mergeCheckoutConflict=error: Your local changes to the following files would be overwritten by merge: mergeFailed=Automatic merge failed; fix conflicts and then commit the result +mergeCheckoutFailed=Please, commit your changes or stash them before you can merge. mergeMadeBy=Merge made by the ''{0}'' strategy. mergedSquashed=Squash commit -- not updating HEAD\nAutomatic merge went well; stopped before committing as requested mergeWentWellStoppedBeforeCommitting=Automatic merge went well; stopped before committing as requested |