On Thu, Jun 7, 2012 at 3:02 PM, Colin Hall <[email protected]> wrote:
> On Thu, Jun 07, 2012 at 01:32:08PM +0200, David Kastrup wrote:
>> { 50 lines } => << { 50 lines } { mixture of s and dynamics } >>
>
> Let's see how that looks in git diff:
>
> $
> $ git diff
> diff --git a/score.ly b/score.ly
> index 9000b2f..a12e07e 100644
> --- a/score.ly
> +++ b/score.ly
> @@ -1,10 +1,17 @@
> \score
> {
> - {
> - c c c c |
> - c c c c |
> - c c c c |
> - c c c c |
> - c c c c |
> - }
> + <<
> + {
> + c c c c |
> + c c c c |
> + c c c c |
> + c c c c |
> + }
> + {
> + s\p s s s |
> + s s s s |
> + s\mf s s s |
> + s s s s |
> + }
> + >>
> }
> $
> $
What about -b flag? (ignore whitespace)
git diff -b
diff --git a/blah b/blah
index 2ffc968..fb09c6e 100644
--- a/blah
+++ b/blah
@@ -1,4 +1,5 @@
{
+ <<
{
c c c c
c c c c
@@ -6,4 +7,11 @@
c c c c
c c c c
}
+ {
+ s\p s s s |
+ s s s s |
+ s\mf s s s |
+ s s s s |
+ }
+ >>
}
looks usable to me.
Not sure if git merge can use this, though.
_______________________________________________
lilypond-user mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/lilypond-user
