Commit f670b14
committed
filediff: Assume non-existant output files are writable (bgo#730194)
The scenario this handles is VCs that give a non-existant file as the
target file for a merge, expecting the helper (i.e., us) to write
that file if the merge was successful.1 parent ba19b27 commit f670b14
1 file changed
Lines changed: 9 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1046 | 1046 | | |
1047 | 1047 | | |
1048 | 1048 | | |
1049 | | - | |
1050 | | - | |
| 1049 | + | |
| 1050 | + | |
| 1051 | + | |
| 1052 | + | |
| 1053 | + | |
1051 | 1054 | | |
1052 | 1055 | | |
1053 | 1056 | | |
| |||
1179 | 1182 | | |
1180 | 1183 | | |
1181 | 1184 | | |
1182 | | - | |
| 1185 | + | |
| 1186 | + | |
| 1187 | + | |
| 1188 | + | |
1183 | 1189 | | |
1184 | 1190 | | |
1185 | 1191 | | |
| |||
0 commit comments