Fossil

Diff
Login

Diff

Differences From Artifact [c5928ebbeb]:

To Artifact [be5a4b8efc]:


764
765
766
767
768
769
770
771

772
773
774
775
776
777
778
779
764
765
766
767
768
769
770

771

772
773
774
775
776
777
778







-
+
-







  @ <input type="submit" name="submit" value="Apply Changes" />
  @ <hr />
  @ Baseline: \
  skin_emit_skin_selector("basis", zBasis, zDraft);
  @ <input type="submit" name="diff" value="Unified Diff" />
  @ <input type="submit" name="sbsdiff" value="Side-by-Side Diff" />
  if( P("diff")!=0 || P("sbsdiff")!=0 ){
    u64 diffFlags = construct_diff_flags(0,0) |
    u64 diffFlags = construct_diff_flags(1) | DIFF_STRIP_EOLCR;
                        DIFF_STRIP_EOLCR;
    Blob from, to, out;
    if( P("sbsdiff")!=0 ) diffFlags |= DIFF_SIDEBYSIDE;
    blob_init(&to, zContent, -1);
    blob_init(&from, skin_file_content(zBasis, zFile), -1);
    blob_zero(&out);
    if( diffFlags & DIFF_SIDEBYSIDE ){
      text_diff(&from, &to, &out, 0, diffFlags | DIFF_HTML | DIFF_NOTTOOBIG);