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

Side by Side Diff: infra/services/gnumbd/test/gnumbd_test.expected/manual_merge_commits_ok.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 6a6a537d5a9e56978c2cca0dcd550383e563e615: 4 6a6a537d5a9e56978c2cca0dcd550383e563e615:
5 - Two for one! 5 - Two for one!
6 - '' 6 - ''
7 - 'Cr-Commit-Position: refs/heads/master@{#101}' 7 - 'Cr-Commit-Position: refs/heads/master@{#101}'
8 497a51ee3c7cc6826aeca9070a4be56011f8e5f6: 8 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:
9 - Incoming merge! 9 - Incoming merge!
10 - '' 10 - ''
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 - '' 97 - ''
98 - 'Cr-Commit-Position: refs/heads/master@{#101}' 98 - 'Cr-Commit-Position: refs/heads/master@{#101}'
99 497a51ee3c7cc6826aeca9070a4be56011f8e5f6: 99 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:
100 - Incoming merge! 100 - Incoming merge!
101 - '' 101 - ''
102 - 'Cr-Commit-Position: refs/heads/other@{#20}' 102 - 'Cr-Commit-Position: refs/heads/other@{#20}'
103 f493b56e446fb46797fa09bbf5888790acb039f2: 103 f493b56e446fb46797fa09bbf5888790acb039f2:
104 - Base commit 104 - Base commit
105 - '' 105 - ''
106 - 'Cr-Commit-Position: refs/heads/master@{#100}' 106 - 'Cr-Commit-Position: refs/heads/master@{#100}'
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698