diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2022-02-12 21:23:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-12 21:23:01 -0500 |
| commit | aded938e00357263a9c0ef24f9ef573873dbf086 (patch) | |
| tree | c45d8be83b18ddf4dbed17bfd51adbb221980ece /.github/release.yml | |
| parent | d99b4019e1e8acdfdbd8dea6623df48008c98dc7 (diff) | |
| parent | 0fbf62cd2027e4ad6aed1d207099c17d2414073c (diff) | |
| download | libgit2-aded938e00357263a9c0ef24f9ef573873dbf086.tar.gz | |
Merge pull request #6204 from boretrk/merge_flags
merge: fix overlap between GIT_MERGE_FILE_FAVOR__CONFLICTED and GIT_MERGE_FILE_SIMPLIFY_ALNUM
Diffstat (limited to '.github/release.yml')
0 files changed, 0 insertions, 0 deletions