I mean that you have just told git that this line has been modified, but
it's a line that unified builtins would have also modified. This creates a
merge conflict. I'd rather not have to deal with it.
On May 22, 2014 8:18 PM, "Yilong Li" <notifications@github.com> wrote:

> In
> src/javasources/KTool/src/org/kframework/backend/java/symbolic/JavaSymbolicKRun.java:
>
> > @@ -301,10 +319,10 @@ private ConstrainedTerm javaKILRun(org.kframework.kil.Term cfg, int bound) {
> >          stateMap.put((org.kframework.kil.Term) org.kframework.kil.GenericToken.kAppOf("Id", "$1"), (org.kframework.kil.Term) org.kframework.kil.IntBuiltin.kAppOf("1"));
> >          ((org.kframework.kil.Cell) o)
> >                  .setContents(new org.kframework.kil.MapBuiltin(context
> > -                        .dataStructureSortOf("MyMap"),
>
> Are you referring to all the changes that simply remove trailing
> white-spaces?
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/kframework/k/pull/321/files#r12982762>
> .
>