| commit | f5c26753e4c8a1f45b9d7edefa976fe4ea932e26 | [log] [tgz] |
|---|---|---|
| author | Anthony Sottile <asottile@umich.edu> | Mon Apr 25 09:01:38 2022 -0400 |
| committer | GitHub <noreply@github.com> | Mon Apr 25 09:01:38 2022 -0400 |
| tree | 78f3ce3b05cf4371d7fb0a9e78dcf90c3e17f1d2 | |
| parent | 5d1ab6d7f3e8f928c896232d2fb0ff95b3563ca6 [diff] | |
| parent | aa56da853574fa6128b06cf53f5b6bdbc16d4534 [diff] |
Merge pull request #759 from bagerard/bagerard-patch-check-merge-conflict-doc Document check-merge-conflict argument