Skip to content

Commit

Permalink
Merge with Conflict Markers
Browse files Browse the repository at this point in the history 
CONFLICT (content): Merge conflict in clang/test/Driver/linker-wrapper.c
  • Loading branch information
@jsji
jsji committed Sep 8, 2024
2 parents de4851c + 9839191 commit 3e9f638
Show file tree
Hide file tree
Showing 5,273 changed files with 291,819 additions and 137,565 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 5 additions & 1 deletion .git-blame-ignore-revs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,5 +88,9 @@ e2c2ffbe7a1b5d9e32a2ce64279475b50c4cba5b
# [lldb][nfc] Deindent ProcessGDBRemote::SetThreadStopInfo by two levels
b32931c5b32eb0d2cf37d688b34f8548c9674c19

# [libc++][NFC] Fix inconsistent quoting and spacing in our CSV files
# [libc++] Various consistency fixes to the CSV files that we use for tracking Standards Conformance
64946fdaf9864d8279da1c30e4d7214fe13d1427
b6262880b34629e9d7a72b5a42f315a3c9ed8139
39c7dc7207e76e72da21cf4fedda21b5311bf62d
e80bc777749331e9519575f416c342f7626dd14d
7e5cd8f1b6c5263ed5e2cc03d60c8779a8d3e9f7
7 changes: 7 additions & 0 deletions .github/new-prs-labeler.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,13 @@ clang:openmp:
- llvm/unittests/Frontend/OpenMP*
- llvm/test/Transforms/OpenMP/**

clang:as-a-library:
- clang/tools/libclang/**
- clang/bindings/**
- clang/include/clang-c/**
- clang/test/LibClang/**
- clang/unittest/libclang/**

openmp:libomp:
- any: ['openmp/**', '!openmp/libomptarget/**']

Expand Down
Loading

0 comments on commit 3e9f638

Please sign in to comment.