|
From: | Stefan Monnier |
Subject: | Re: Two feature ideas for diffs |
Date: | Sun, 10 Nov 2013 08:24:41 -0500 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
>> Is it really all it takes to detect `conflict' state? > Git conflict state detection worked when I implemented the feature many > moons ago, although it was not 100% reliable. It doesn't work anymore. > Maybe something was lost on one of the many merges. Could you try and make it work again and submit/install the patch for that? Stefan
[Prev in Thread] | Current Thread | [Next in Thread] |