Skip to content

Commit ba795a5

Browse files
Esemesekfregante
andcommitted
Add conflict-marker feature (#2310)
Co-authored-by: Federico Brigante <opensource@bfred.it>
1 parent d093358 commit ba795a5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

source/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export const isPR = (): boolean => /^pull\/\d+/.test(getRepoPath()!);
6060

6161
export const isConflict = (): boolean => /^pull\/\d+\/conflicts/.test(getRepoPath()!);
6262

63-
export const isPRList = (): boolean => getRepoPath() === 'pulls';
63+
export const isPRList = (): boolean => location.pathname === '/pulls' || getRepoPath() === 'pulls';
6464

6565
export const isPRCommit = (): boolean => /^pull\/\d+\/commits\/[0-9a-f]{5,40}/.test(getRepoPath()!);
6666

0 commit comments

Comments
 (0)