|
From: | Stefan Monnier |
Subject: | Re: Move to git is imminent - awaiting Stefan's approval |
Date: | Tue, 07 Jan 2014 08:45:47 -0500 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
> You can use git-mergetool with ediff-merge for this. I find ediff too heavy, so it would have to be smerge-mode instead. But, while I'd be happy to take patches to better support git-mergetool (if needed), I prefer using the vc-find-conflicted-files workflow. It could probably run git-mergetool internally. Stefan
[Prev in Thread] | Current Thread | [Next in Thread] |