Commit d36376a
committed
fixup??? Win32: implement readlink()
Another merge conflict resolution not recorded by `git rerere`.
Signed-off-by: Johannes Schindelin <[email protected]>1 parent 0ea4d89 commit d36376a
1 file changed
+1
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
120 | 120 | | |
121 | 121 | | |
122 | 122 | | |
123 | | - | |
124 | | - | |
125 | 123 | | |
126 | 124 | | |
127 | 125 | | |
| |||
196 | 194 | | |
197 | 195 | | |
198 | 196 | | |
| 197 | + | |
199 | 198 | | |
200 | 199 | | |
201 | 200 | | |
| |||
0 commit comments