Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Rename the test-udiff command to test-diff and give it the capability to use the --tk option. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
4cf8c16cd82f160a61038ea34dba1ca7 |
| User & Date: | drh 2012-12-14 18:58:45.280 |
Context
|
2012-12-14
| ||
| 21:24 | Improvements to the side-by-side diff display for indentation changes with minor edits. ... (check-in: c4bbc4a9af user: drh tags: trunk) | |
| 18:58 | Rename the test-udiff command to test-diff and give it the capability to use the --tk option. ... (check-in: 4cf8c16cd8 user: drh tags: trunk) | |
| 11:50 | include <winsock2.h> before <ws2tcpip.h> whenever needed. Thanks to Konstantin Khomoutov for reporting this. ... (check-in: 0658068a23 user: jan.nijtmans tags: trunk) | |
Changes
Changes to src/diff.c.
| ︙ | ︙ | |||
1871 1872 1873 1874 1875 1876 1877 |
}
/* free(R); */
blob_reset(&b);
}
}
/*
| | > > | > > > > > > > | 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 |
}
/* free(R); */
blob_reset(&b);
}
}
/*
** COMMAND: test-diff
**
** Usage: %fossil [options] FILE1 FILE2
**
** Print the difference between two files. The usual diff options apply.
*/
void test_udiff_cmd(void){
Blob a, b, out;
u64 diffFlag;
if( find_option("tk",0,0)!=0 ){
diff_tk("test-diff", 2);
return;
}
find_option("i",0,0);
diffFlag = diff_options();
if( g.argc!=4 ) usage("FILE1 FILE2");
diff_print_filenames(g.argv[2], g.argv[3], diffFlag);
blob_read_from_file(&a, g.argv[2]);
blob_read_from_file(&b, g.argv[3]);
blob_zero(&out);
text_diff(&a, &b, &out, diffFlag);
blob_write_to_file(&out, "-");
}
|
| ︙ | ︙ |