Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2004-10-29 | The common merge code merely needs to offer the abstraction of routines | guy | 1 | -60/+29 |
2004-10-28 | Make "merge_files()" and "merge_append_files()" return a tri-state | guy | 1 | -4/+15 |
2004-10-28 | Remove all the verbose-mode code from merge.c, and put most of it in | guy | 1 | -17/+8 |
2004-10-27 | Get rid of merge_n_files() - it's only called in one place now, and | guy | 1 | -26/+0 |
2004-10-27 | Change some of the merge.c APIs to return more information on failure, | guy | 1 | -17/+34 |
2004-10-17 | From Mark C. Brown: allow the file type for the merge operation to be | guy | 1 | -1/+1 |
2004-07-18 | Set the svn:eol-style property on all text files to "native", so that | guy | 1 | -1/+1 |
2004-06-29 | avoid using tmpnam() for security reasons. | ulfl | 1 | -3/+3 |
2004-06-21 | if more than one file is (drag and) dropped into the program, | ulfl | 1 | -5/+5 |
2004-06-18 | Fix compile errors on Suse 9.1: | jmayer | 1 | -3/+3 |
2004-06-18 | merge: remove code duplication in merge.c and mergecap.c (put it in merge.c), | ulfl | 1 | -0/+163 |