Commits

Commit:
937e0e58712b4c76542d1d1485bce7679b7320a6
From:
Stefan Sperling <stsp@stsp.name>
Date:
fix build on sparc64 (uninitialized variable)
diff | patch | tree
Commit:
f69721c3fc6f5a7b7a11a49a1fd7a99182ef01f0
From:
Stefan Sperling <stsp@stsp.name>
Date:
show base commit hash and omit filenames in conflict markers
diff | patch | tree
Commit:
d136cfcb987bd2fd865f8711449dc47b7f63455f
From:
Stefan Sperling <stsp@stsp.name>
Date:
show original file content in conflict markers
diff | patch | tree
Commit:
d59c0cb27bc304bc11f9b1094c6eb85f248c7c5f
From:
Stefan Sperling <stsp@stsp.name>
Date:
improve use of mixed size_t/off_t types in diff3.c's edscript()
diff | patch | tree
Commit:
b2338effff1d654d54ab1abfdebefee508ea1a6c
From:
Stefan Sperling <stsp@stsp.name>
Date:
diff3.c: do not use the same variables for both line numbers and byte offsets
diff | patch | tree
Commit:
887758148e9d113851e356d0339dc4a726b04bc0
From:
Stefan Sperling <stsp@stsp.name>
Date:
diff3.c's skip() returns number of bytes skipped so switch from int to size_t
diff | patch | tree
Commit:
96cbb59708cdbe5ff619b9d9cccae495277071e5
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove worklist code; it was only used to unlink files which we already unlink
diff | patch | tree
Commit:
68bda3b1b9c8bd7159479cf0c194d755b7d2a7cd
From:
Stefan Sperling <stsp@stsp.name>
Date:
diff3.c: check for unlink errors and unlink dp13 and dp23 again
diff | patch | tree
Commit:
9688d20ad63057dfb1047a7c31d629b07d92618b
From:
Stefan Sperling <stsp@stsp.name>
Date:
rename local variable in diff3.c's edscript() from j to len (not a loop index)
diff | patch | tree
Commit:
9d4a5e899df48f7da001cde629f33a3de43b6092
From:
Stefan Sperling <stsp@stsp.name>
Date:
rename local variable in diff3.c's skip() from j to len (not a loop index)
diff | patch | tree
Commit:
db33008019148e836335b567f0f5be5e757f2bdb
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove pointless attempt of unlinking temporary file name template paths
diff | patch | tree
Commit:
e45311301ff386e9a2f9ff3e613d520f57ad119b
From:
Stefan Sperling <stsp@stsp.name>
Date:
do not leak open file in diff3.c's readin() error paths
diff | patch | tree
Commit:
971405a7e47997a87d869bc30b3fca98083395dc
From:
Stefan Sperling <stsp@stsp.name>
Date:
do not abuse d3s->fp[0] as a local variable in diff3.c's readin()
diff | patch | tree
Commit:
50351dee7e55367d42b3a715d56abdd7751978cd
From:
Stefan Sperling <stsp@stsp.name>
Date:
remove unused 'pr' argument from diff3.c's skip() function
diff | patch | tree
Commit:
575e82180aa41c12a56f88f1c9dd01d1bac56424
From:
Stefan Sperling <stsp@stsp.name>
Date:
more mechanical conversions to struct got_error: buf_load() and buf_alloc()
diff | patch | tree