Skip to content

Commit 4f640bb

Browse files
committed
Adding a simple console based diff
1 parent c182306 commit 4f640bb

File tree

1 file changed

+32
-2
lines changed

1 file changed

+32
-2
lines changed

bin/diff.dart

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1-
void main() {
2-
print("Hello, World!");
1+
import "dart:io";
2+
3+
import "package:diff/diff.dart";
4+
5+
void main(List<String> args) {
6+
if (args.length != 3) {
7+
print("diff.dart [ours] [base] [theirs]");
8+
return;
9+
}
10+
11+
String filename1 = args[0]; // ours
12+
String filename2 = args[1]; // base
13+
String filename3 = args[2]; // theirs
14+
15+
File file1 = new File(filename1);
16+
String file1Contents = file1.readAsStringSync();
17+
18+
File file2 = new File(filename2);
19+
String file2Contents = file2.readAsStringSync();
20+
21+
File file3 = new File(filename3);
22+
String file3Contents = file3.readAsStringSync();
23+
24+
Diff3DigResult diff3DigResult = diff3_dig(file1Contents, file2Contents,
25+
file3Contents);
26+
27+
if (diff3DigResult.Conflict) {
28+
print("diff3_dig: $filename1, $filename2, $filename3");
29+
print(diff3DigResult.Text.join("\n"));
30+
} else {
31+
print("No conflicts found with $filename1, $filename2, $filename3");
32+
}
333
}

0 commit comments

Comments
 (0)