0f716e62c5d73fc183c8eebc7d4fafc7495b5771 - gerrit

commit	0f716e62c5d73fc183c8eebc7d4fafc7495b5771	[log] [tgz]
author	Brad Larson <bklarson@gmail.com>	Mon Mar 05 13:50:56 2012 -0600
committer	Brad Larson <bklarson@gmail.com>	Tue Mar 06 11:39:29 2012 -0600
tree	6ae63fd2e7ef8a7970566290343a8c2582ccc928
parent	c36914973c2053ef76d7af4b63d9cfd5e4b13d6d [diff]

Use 'Auto Merge' for merge commit's base comparison

When reviewing a merge commit, the old wording in the version history dropdown
of 'Base' doesn't really match Gerrit's behavior.  Updating this to use
'Auto Merge' as suggested by SOP on IRC.

Signed-off-by: Brad Larson <bklarson@gmail.com>
Change-Id: Ia71eeb063c1b0d71789dbb584825f4220195ec40

gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java[diff]
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties[diff]
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java[diff]
gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/HistoryTable.java[diff]
gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.java[diff]
gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties[diff]

6 files changed