[Monotone-commits-diffs] Revision 17d3df5073632e84bbd7a7fb5bf96be198c6c02c

[monotone]

-----------------------------------------------------------------
Revision: 17d3df5073632e84bbd7a7fb5bf96be198c6c02c
Ancestor: 3ce81202b68163f1bd6e4d4dfa8e4dcd24c300a1
Author: address@hidden
Date: 2005-05-30T05:29:58
Branch: net.venge.monotone

Modified files:
        ChangeLog tests/t_fmerge.at testsuite.at

ChangeLog: 

        * testsuite.at: use "command -v" rather than "which", since
        Solaris doesn't give useful exit codes for "which".
        * tests/t_fmerge.at: don't use --merge with diff3, pipe to ed instead
        so we don't rely on gnu diff3.

txtid59YYvvwc.txt
Description: Diff [3ce81202b68163f1bd6e4d4dfa8e4dcd24c300a1] -> [17d3df5073632e84bbd7a7fb5bf96be198c6c02c]