Skip to content

Commit e58b2b2

Browse files
committed
format file
1 parent 4a74085 commit e58b2b2

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

lib/src/diff.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ List<String> diff_merge_keepall(List<String> file1, List<String> file2) {
378378
if (chunk.file2.Length > 0) {
379379
//copy any not-yet-copied portion of file1 to the end of this patch entry
380380
result.addAll(file1.getRange(file1CompletedToOffset, chunk.file1.Offset +
381-
chunk.file1.Length).toList());
381+
chunk.file1.Length).toList());
382382
file1CompletedToOffset = chunk.file1.Offset + chunk.file1.Length;
383383

384384
// copy the file2 portion of this patch entry
@@ -669,7 +669,8 @@ Diff3DigResult diff3_dig(String ours, String base, String theirs) {
669669
if (item is MergeOKResultBlock) {
670670
lines.addAll(item.ContentLines);
671671
} else if (item is MergeConflictResultBlock) {
672-
List<commonOrDifferentThing> inners = diff_comm(item.LeftLines, item.RightLines);
672+
List<commonOrDifferentThing> inners = diff_comm(item.LeftLines,
673+
item.RightLines);
673674
for (int j = 0; j < inners.length; j++) {
674675
commonOrDifferentThing inner = inners[j];
675676
if (inner.common.length > 0) {

0 commit comments

Comments
 (0)