[darcs-users] pull --external-merge does not expand parameters

Josef Svenningsson josef.svenningsson at gmail.com
Thu Mar 10 13:11:47 UTC 2005


On Thu, 10 Mar 2005 14:30:36 +1100, STIEN Malte
<Malte_Stien at rta.nsw.gov.au> wrote:
> Folks,
> 
> I am using darcs 1.0.2 under cygwin under Windows 2000 and I am currently trying to get darcs to call TortoiseMerge if a conflict arises during a merge. In the darcs manual, on page 37, it explains that this is easily done by providing the --external-merge option to the pull command. The option is to contain some parameters (%1, %2, %a and %o) that are meant to be expanded by darcs with the filenames of the files to be merged, the common ancestor of those files as well as the output files.
> 
Currently darcs requires you to surround these parameters with blanks.
Is it possible for you to  insert spaces before the parameters?

Otherwise we should consider changing darcs behaviour.

/Josef




More information about the darcs-users mailing list