Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Side by Side Diff: infra/services/gnumbd/test/gnumbd_test.expected/merge_commits_fail.yaml

Issue 355153002: Refactor infra git libs and testing. (Closed) Base URL: https://chromium.googlesource.com/infra/infra@fake_testing_support
Patch Set: Change config ref to have a sandard naming scheme Created 6 years, 5 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 unified diff | Download patch
OLDNEW
1 - - The setup. 1 - - The setup.
2 - origin: 2 - origin:
3 refs/heads/master: 3 refs/heads/master:
4 f493b56e446fb46797fa09bbf5888790acb039f2: 4 f493b56e446fb46797fa09bbf5888790acb039f2:
5 - Base commit 5 - Base commit
6 - '' 6 - ''
7 - 'Cr-Commit-Position: refs/heads/master@{#100}' 7 - 'Cr-Commit-Position: refs/heads/master@{#100}'
8 refs/heads/other: 8 refs/heads/other:
9 497a51ee3c7cc6826aeca9070a4be56011f8e5f6: 9 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:
10 - Incoming merge! 10 - Incoming merge!
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 38b859f0a917740e3f427a6aa7d3322ff3934693: 58 38b859f0a917740e3f427a6aa7d3322ff3934693:
59 - Two for one! 59 - Two for one!
60 497a51ee3c7cc6826aeca9070a4be56011f8e5f6: 60 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:
61 - Incoming merge! 61 - Incoming merge!
62 - '' 62 - ''
63 - 'Cr-Commit-Position: refs/heads/other@{#20}' 63 - 'Cr-Commit-Position: refs/heads/other@{#20}'
64 f493b56e446fb46797fa09bbf5888790acb039f2: 64 f493b56e446fb46797fa09bbf5888790acb039f2:
65 - Base commit 65 - Base commit
66 - '' 66 - ''
67 - 'Cr-Commit-Position: refs/heads/master@{#100}' 67 - 'Cr-Commit-Position: refs/heads/master@{#100}'
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698