Skip to content

Commit 2b72717

Browse files
authored
Merge branch 'main' into main
2 parents ce8b0ea + a301079 commit 2b72717

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/repo/issue/view_content/pull_merge_instruction.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}
88
{{$localBranch = print .PullRequest.HeadRepo.OwnerName "-" .PullRequest.HeadBranch}}
99
{{end}}
10-
<div class="ui secondary segment">
10+
<div class="ui secondary segment tw-font-mono">
1111
{{if eq .PullRequest.Flow 0}}
1212
<div>git fetch -u {{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}<origin-url data-url="{{.PullRequest.HeadRepo.Link}}"></origin-url>{{else}}origin{{end}} {{.PullRequest.HeadBranch}}:{{$localBranch}}</div>
1313
{{else}}
@@ -23,7 +23,7 @@
2323
<div>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_warning"}}</div>
2424
{{end}}
2525
</div>
26-
<div class="ui secondary segment">
26+
<div class="ui secondary segment tw-font-mono">
2727
<div data-pull-merge-style="merge">
2828
<div>git checkout {{.PullRequest.BaseBranch}}</div>
2929
<div>git merge --no-ff {{$localBranch}}</div>

0 commit comments

Comments
 (0)