summaryrefslogtreecommitdiff
path: root/src/diff3.c
Commit message (Collapse)AuthorAgeFilesLines
...
* (copy_stringlist, compare_line_list): bcmp -> memcmpPaul Eggert1993-09-131-5/+5
|
* Add prototypes to function declarations. Use size_t, not int, when needed.Paul Eggert1993-08-271-741/+674
| | | | | | | | | | | Use `const' when needed to pacify gcc. Use STD{IN,OUT,ERR}_FILENO instead of [012]. (VOID): Move to system.h. (version_string): Now char[]. (usage): Sort options. (process_diff): Pacify `gcc -Wall' with a useless assignment. (read_diff): pid is of type pid_t, not int. Use waitpid if available. (output_diff3): Simplify test for `\ No newline at end of file' message.
* Attempt to do a better job with three two-way diffs.Paul Eggert1993-07-041-589/+649
| | | | | This was a file labeled diff3.c.new-notdone, dated 1992-04-27, with user name `randy'.
* (longopts): Change NULL to 0.Paul Eggert1993-05-261-10/+10
|
* (tab_align_flag): New variable, for new -T option.Paul Eggert1993-05-251-4/+13
| | | | (main, usage, output_diff3): Add support for -T.
* entered into RCSPaul Eggert1993-04-231-5/+19
|
* *** empty log message ***Richard M. Stallman1993-02-111-2/+2
|
* *** empty log message ***Paul Eggert1992-11-121-1/+1
|
* *** empty log message ***Paul Eggert1992-11-091-138/+211
|
* *** empty log message ***Paul Eggert1992-10-051-370/+299
|
* *** empty log message ***David MacKenzie1992-09-031-2/+2
|
* *** empty log message ***David MacKenzie1992-07-071-52/+9
|
* *** empty log message ***David MacKenzie1992-07-071-59/+85
|
* Initial revisionDavid MacKenzie1992-07-031-0/+1694