Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDariusz Luksza2010-11-29 16:51:23 -0500
committerDariusz Luksza2010-12-13 15:03:34 -0500
commit708e8f6ce344648347e6c287e144e5168856e3d4 (patch)
tree927908cfa4dbb8011bd093d9dee5c083f44c1eda /org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
parentab4217e47a0f224f0e680fbf0b73ddb4d3b4ad0a (diff)
downloadegit-708e8f6ce344648347e6c287e144e5168856e3d4.tar.gz
egit-708e8f6ce344648347e6c287e144e5168856e3d4.tar.xz
egit-708e8f6ce344648347e6c287e144e5168856e3d4.zip
Fix compare input for local changes nodes.
GitModelBlob class was using compare() and hashCode() methods implementation from GitModelCommit, therefore in some cases Compare View was showing wrong files in comparison. It also fixes wrong headers in the compare editor. Bug: 326674 Change-Id: If42607deca500f3439c512382af0b13b01b90b3d Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties2
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
index ae6fdccf40..88e4a57fed 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
@@ -761,6 +761,8 @@ GitCompareFileRevisionEditorInput_LocalHistoryLabel=Local history: {0} {1}
GitCompareFileRevisionEditorInput_LocalLabel=Local: {0}
GitCompareFileRevisionEditorInput_LocalRevision=Local Revision
GitCompareFileRevisionEditorInput_RevisionLabel={0} {1} ({2})
+GitCompareFileRevisionEditorInput_LocalVersion={0} (local version)
+GitCompareFileRevisionEditorInput_StagedVersion={0} (staged version)
GitCreateGeneralProjectPage_DirLabel=Directory
GitCreateGeneralProjectPage_DirNotExistMessage=Directory {0} does not exist
GitCreateGeneralProjectPage_EnterProjectNameMessage=Please provide a project name

Back to the top