604d132 journalctl: make --follow work with --merge again

1 file Authored by mrc0mmand 2 years ago, Committed by zbyszek 2 years ago,
    journalctl: make --follow work with --merge again
    
    Set --boot with --follow only if it's not already set and if --merge is
    not used, since it's not compatible with --boot.
    
    Follow-up to 2dd9285bac.
    Resolves: #24565
    
    (cherry picked from commit e47622a61cc252df3f19190d362de5a27c93060d)
    
        
file modified
+6 -5