Merge "Remove incorrect branch from rebase instruction"
diff --git a/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status.ts b/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status.ts
index d83ca49..7cf9bb1 100644
--- a/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status.ts
+++ b/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status.ts
@@ -35,9 +35,9 @@
"It will not appear on dashboards unless you are CC'ed or assigned, " +
'and email notifications will be silenced until the review is started.';
-const MERGE_CONFLICT_TOOLTIP =
+export const MERGE_CONFLICT_TOOLTIP =
'This change has merge conflicts. ' +
- 'Download the patch and run "git rebase master". ' +
+ 'Download the patch and run "git rebase". ' +
'Upload a new patchset after resolving all merge conflicts.';
const PRIVATE_TOOLTIP =
diff --git a/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status_test.js b/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status_test.js
index 770a21c..16fc664 100644
--- a/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status_test.js
+++ b/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status_test.js
@@ -17,6 +17,7 @@
import '../../../test/common-test-setup-karma.js';
import './gr-change-status.js';
+import {MERGE_CONFLICT_TOOLTIP} from './gr-change-status.js';
const basicFixture = fixtureFromElement('gr-change-status');
@@ -24,10 +25,6 @@
'It will not appear on dashboards unless you are CC\'ed or assigned, ' +
'and email notifications will be silenced until the review is started.';
-const MERGE_CONFLICT_TOOLTIP = 'This change has merge conflicts. ' +
- 'Download the patch and run "git rebase master". ' +
- 'Upload a new patchset after resolving all merge conflicts.';
-
const PRIVATE_TOOLTIP = 'This change is only visible to its owner and ' +
'current reviewers (or anyone with "View Private Changes" permission).';
