Commit 14fc1bf
fixup??? compat/mingw: handle WSA errors in strerror
Merge conflict resolutions that are outside of any conflict marker are
not recorded by `git rerere`.
Signed-off-by: Johannes Schindelin <[email protected]>1 parent 2aab78a commit 14fc1bf
1 file changed
+5
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
292 | 292 | | |
293 | 293 | | |
294 | 294 | | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
295 | 300 | | |
296 | 301 | | |
297 | 302 | | |
| |||
0 commit comments