diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index d59ed427edf..656a18e885c 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -422,8 +422,8 @@ export class CommandCenter {
 
 		type InputData = { uri: Uri; title?: string; detail?: string; description?: string };
 		const mergeUris = toMergeUris(uri);
-		const ours: InputData = { uri: mergeUris.ours, title: localize('Yours', 'Yours') };
-		const theirs: InputData = { uri: mergeUris.theirs, title: localize('Theirs', 'Theirs') };
+		const current: InputData = { uri: mergeUris.ours, title: localize('Current', 'Current') };
+		const incoming: InputData = { uri: mergeUris.theirs, title: localize('Incoming', 'Incoming') };
 
 		try {
 			const [head, rebaseOrMergeHead] = await Promise.all([
@@ -431,12 +431,12 @@ export class CommandCenter {
 				isRebasing ? repo.getCommit('REBASE_HEAD') : repo.getCommit('MERGE_HEAD')
 			]);
 			// ours (current branch and commit)
-			ours.detail = head.refNames.map(s => s.replace(/^HEAD ->/, '')).join(', ');
-			ours.description = '$(git-commit) ' + head.hash.substring(0, 7);
+			current.detail = head.refNames.map(s => s.replace(/^HEAD ->/, '')).join(', ');
+			current.description = '$(git-commit) ' + head.hash.substring(0, 7);
 
 			// theirs
-			theirs.detail = rebaseOrMergeHead.refNames.join(', ');
-			theirs.description = '$(git-commit) ' + rebaseOrMergeHead.hash.substring(0, 7);
+			incoming.detail = rebaseOrMergeHead.refNames.join(', ');
+			incoming.description = '$(git-commit) ' + rebaseOrMergeHead.hash.substring(0, 7);
 
 		} catch (error) {
 			// not so bad, can continue with just uris
@@ -446,8 +446,8 @@ export class CommandCenter {
 
 		const options = {
 			base: mergeUris.base,
-			input1: isRebasing ? ours : theirs,
-			input2: isRebasing ? theirs : ours,
+			input1: isRebasing ? current : incoming,
+			input2: isRebasing ? incoming : current,
 			output: uri
 		};