gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-26 19:15:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use yellow for merge conflict instead of blue

Browse Source
This commit is contained in:
Mattias Granlund 2023-07-24 16:19:06 +01:00
parent cf115e8cc3
commit 2994bc256d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/routes/repo/[projectId]/Tray.svelte
View File

@ -80,7 +80,7 @@
{#if !branch.baseCurrent}
<!-- branch will cause merge conflicts if applied -->
<Tooltip label="Will introduce merge conflicts if applied">
<div class="text-blue-500">&#9679;</div>
<div class="text-yellow-500">&#9679;</div>
</Tooltip>
{:else if branch.mergeable}
<Tooltip label="Can be applied cleanly">