Search found 2 matches
- Wed May 06, 2009 2:49 pm
- Forum: Support (DiffMerge)
- Topic: exit codes when writing / not writing merged files
- Replies: 11
- Views: 14253
Re: exit codes when writing / not writing merged files
Im Running on Windows currently, however will also try to run it on Mac OS X soon.
- Wed May 06, 2009 10:04 am
- Forum: Support (DiffMerge)
- Topic: exit codes when writing / not writing merged files
- Replies: 11
- Views: 14253
Re: exit codes when writing / not writing merged files
Hi,
I cant figure out how to correctly use the current version of DiffMerge with Mercurial.
It seems my mercurial.ini (hgrc) isnt correct in order to correctly accept/reject merge results from diffmerge.
Could you maybe provide a sample showing how to do so?
I cant figure out how to correctly use the current version of DiffMerge with Mercurial.
It seems my mercurial.ini (hgrc) isnt correct in order to correctly accept/reject merge results from diffmerge.
Could you maybe provide a sample showing how to do so?