diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2010-08-19 15:52:12 +0200 |
|---|---|---|
| committer | Chris Aniszczyk <caniszczyk@gmail.com> | 2010-08-19 12:16:39 -0500 |
| commit | 75c9b2438594dc6ac125ff1bdf97022c7f429b78 (patch) | |
| tree | 7f209395073f7a5ef9e3e61b2e9be31a444ad525 /org.eclipse.jgit/resources/org/eclipse | |
| parent | 94ba9574cd5589bbf7a3671533390b43936fe65b (diff) | |
| download | jgit-75c9b2438594dc6ac125ff1bdf97022c7f429b78.tar.gz jgit-75c9b2438594dc6ac125ff1bdf97022c7f429b78.zip | |
Enhance MergeResult to report conflicts, etc
The MergeResult class is enhanced to report more data about a
three-way merge. Information about conflicts and the base, ours,
theirs commits can be retrived.
Change-Id: Iaaf41a1f4002b8fe3ddfa62dc73c787f363460c2
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Diffstat (limited to 'org.eclipse.jgit/resources/org/eclipse')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties index a9878f8d29..faeb1d53f9 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties @@ -222,7 +222,7 @@ lockOnNotHeld=Lock on {0} not held. malformedpersonIdentString=Malformed PersonIdent string (no < was found): {0} mergeStrategyAlreadyExistsAsDefault=Merge strategy "{0}" already exists as a default strategy mergeStrategyDoesNotSupportHeads=merge strategy {0} does not support {1} heads to be merged into HEAD -mergeUsingStrategyResultedInDescription=Merge using strategy {0} resulted in: {1}. {2} +mergeUsingStrategyResultedInDescription=Merge of revisions {0} with base {1} using strategy {2} resulted in: {3}. {4} missingAccesskey=Missing accesskey. missingDeltaBase=delta base missingForwardImageInGITBinaryPatch=Missing forward-image in GIT binary patch |