Skip to content

Commit c2391f6

Browse files
committed
Merge pull request #1 from dart-gde/dartify_api
Dartify api
2 parents daf3a89 + b691334 commit c2391f6

File tree

6 files changed

+197
-211
lines changed

6 files changed

+197
-211
lines changed

bin/diff.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ void main(List<String> args) {
2121
File file3 = new File(filename3);
2222
String file3Contents = file3.readAsStringSync();
2323

24-
Diff3DigResult diff3DigResult = diff3_dig(file1Contents, file2Contents,
24+
Diff3DigResult diff3DigResult = diff3Dig(file1Contents, file2Contents,
2525
file3Contents);
2626

27-
if (diff3DigResult.Conflict) {
27+
if (diff3DigResult.conflict) {
2828
print("diff3_dig: $filename1, $filename2, $filename3");
29-
print(diff3DigResult.Text.join("\n"));
29+
print(diff3DigResult.text.join("\n"));
3030
} else {
3131
print("No conflicts found with $filename1, $filename2, $filename3");
3232
}

0 commit comments

Comments
 (0)