From: Enrico Weigelt Date: Tue, 21 Sep 2010 15:02:17 GMT Subject: Re: Testing for a merge conflict without a working copy Message-ID: <20100921150217.GB14711@nibiru.local> In-Reply-To: <4C98C4FC.1080904@workspacewhiz.com> * Joshua Jensen 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 ----------------------------------------------------------------------