LukasMeine /
vigilance
| @@ 8325-8325 (lines=1) @@ | ||
| 8322 | } |
|
| 8323 | } |
|
| 8324 | ||
| 8325 | function merge(mine, theirs, base) { |
|
| 8326 | mine = loadPatch(mine, base); |
|
| 8327 | theirs = loadPatch(theirs, base); |
|
| 8328 | ||
| @@ 41-41 (lines=1) @@ | ||
| 38 | } |
|
| 39 | } |
|
| 40 | ||
| 41 | function merge(mine, theirs, base) { |
|
| 42 | mine = loadPatch(mine, base); |
|
| 43 | theirs = loadPatch(theirs, base); |
|
| 44 | ||
