[bug 0.11] commit succeeds with conflict markers in the file

[James Westby]

On (01/12/06 20:20), Jari Aalto wrote:
> 
> No interactive questions this time, pretty please.
> 

I don't think anyone was proposing interactive questions last time.

You say that you don't want interactive questions so that you can script
the commands. Are you happy with your scripts failing because of these
checks? Would you ever write a script that resolved conflicts in a file
and commited it? Would said script ever miss a conflict marker?

James

-- 
  James Westby   --    GPG Key ID: B577FE13    --     http://jameswestby.net/
  seccure key - (3+)k7|M*edCX/.A:n*N!>|&7U.L#9E)Tu)T0>AM - secp256r1/nistp256