Francisco Vila <paconet....@gmail.com> writes:
> 2012/6/5 David Kastrup <d...@gnu.org>:
>> The only automatic merges that are actually safe to do are
>> fast-forwards, and the translation merges are not of that kind.
>
> Sure? we change our own distinct files.
commit 30339cb3706f6399c84607426988b25f79b4998c
Merge: 9578677 9564d28
Author: Francisco Vila <francisco.v...@hispalinux.es>
Date: Thu May 24 17:17:47 2012 +0200
Merge branch 'translation' into staging
Conflicts:
Documentation/de/notation/input.itely
Pretty much every update-with-convert-ly run touches conflicting files.
--
David Kastrup
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
