|
| From: | Óscar Fuentes |
| Subject: | Re: Two feature ideas for diffs |
| Date: | Sat, 09 Nov 2013 16:02:42 +0100 |
| User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
Stefan Monnier <address@hidden> writes: > 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.
| [Prev in Thread] | Current Thread | [Next in Thread] |