|
| From: | Andreas Schwab |
| Subject: | Re: [PATCH] git-merge-changelog: fix missing space after conflict markers |
| Date: | Sun, 09 Jan 2011 14:23:56 +0100 |
| User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/23.2.91 (gnu/linux) |
Bruno Haible <address@hidden> writes: > Andreas Schwab wrote: >> >> As required by git. >> > >> > What do you mean by that? >> >> See rerere.c:is_cmarker. > > Please give a "how to reproduce". Enable rerere and cherry-pick a conflicting changelog. Andreas. -- Andreas Schwab, address@hidden GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."
| [Prev in Thread] | Current Thread | [Next in Thread] |