components/test/data/autofill/merge/output/validation.out - Issue 2110563002: Use AutofillProfileComparator in place of ad-hoc merge logic.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/test/data/autofill/merge/output/validation.out

Issue 2110563002: Use AutofillProfileComparator in place of ad-hoc merge logic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@merge

Patch Set: Rebase Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/test/data/autofill/merge/output/streetaddress.out ('k') | components/test/data/autofill/merge/tools/autofill_merge_common.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/test/data/autofill/merge/output/validation.out

diff --git a/components/test/data/autofill/merge/output/validation.out b/components/test/data/autofill/merge/output/validation.out

index 97484d02d0c35a32aeb9f4f12594d2c952c4cdef..e5d309bc4cc16afc63aeddd672af2abdf5b88209 100644

--- a/components/test/data/autofill/merge/output/validation.out

+++ b/components/test/data/autofill/merge/output/validation.out

@@ -1,8 +1,8 @@

---

NAME_FIRST: John

-NAME_MIDDLE:

+NAME_MIDDLE:

NAME_LAST: Doe

-NAME_FULL:

+NAME_FULL: John Doe

EMAIL_ADDRESS: john.doe@example.com

COMPANY_NAME: TestCo

ADDRESS_HOME_STREET_ADDRESS: 1600 Amphitheatre Parkway

@@ -14,14 +14,14 @@ ADDRESS_HOME_COUNTRY: US

PHONE_HOME_WHOLE_NUMBER: (650) 555-8888

---

NAME_FIRST: Jim

-NAME_MIDDLE:

+NAME_MIDDLE:

NAME_LAST: Smith

-NAME_FULL:

+NAME_FULL:

EMAIL_ADDRESS: john.doe@example.com

-COMPANY_NAME:

+COMPANY_NAME:

ADDRESS_HOME_STREET_ADDRESS: Apt 2

ADDRESS_HOME_CITY: Mountain View

ADDRESS_HOME_STATE: CA

ADDRESS_HOME_ZIP: 94043

-ADDRESS_HOME_COUNTRY:

-PHONE_HOME_WHOLE_NUMBER:

+ADDRESS_HOME_COUNTRY:

+PHONE_HOME_WHOLE_NUMBER: