Testing for a merge conflict without a working copy

Re: Testing for a merge conflict without a working copy

* Joshua Jensen <jjensen@workspacewhiz.com> wrote:

>  If I simply want to determine whether a merge would conflict, is there 
> a way to do it without a working copy?

hmm, you could do it in an temporary working copy (see --work-dir).

cu

-- 
----------------------------------------------------------------------
 Enrico Weigelt, metux IT service -- http://www.metux.de/

 phone:  +49 36207 519931  email: weigelt@metux.de
 mobile: +49 151 27565287  icq:   210169427         skype: nekrad666
----------------------------------------------------------------------
 Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme
----------------------------------------------------------------------