diff options
| author | Benjamin C. Pierce <bcpierce@cis.upenn.edu> | 2006-05-31 01:01:02 +0000 |
|---|---|---|
| committer | Benjamin C. Pierce <bcpierce@cis.upenn.edu> | 2006-05-31 01:01:02 +0000 |
| commit | b5a1ea59ed5c7000d9a519733f3ecde9dafd6aec (patch) | |
| tree | 1e16964b317fa6693a1c908040fd0c9946441d9e /src/fileutil.ml | |
| parent | f4c4e7513204dfe20ae13d0a753623ce40442e35 (diff) | |
| download | unison-b5a1ea59ed5c7000d9a519733f3ecde9dafd6aec.zip unison-b5a1ea59ed5c7000d9a519733f3ecde9dafd6aec.tar.gz unison-b5a1ea59ed5c7000d9a519733f3ecde9dafd6aec.tar.bz2 | |
* Fixed a bug in merging code where Unison could sometimes deadlock
with the external merge program, if the latter produced large
amounts of output.
* Improved the handling of merging in the Mac GUI: merge
results are now displayed in a separate window (like "diff") instead
of flashing past in the status line at the top.
Diffstat (limited to 'src/fileutil.ml')
0 files changed, 0 insertions, 0 deletions