Bug with merge/diff

The following two examples don't merge correctly, in my opinion. The if
statement on the bottom should take priority over the indentation of the
braces.

File 1:
if(a){
        b
        c
        d
        e
        while(f){
                if(g)
                        break;
        }
        if(g && h && i)
                return
}

File 2:
lock(sr){
        if(a){
                b
                c
                d
                e
                while(f){
                        if(g && h && i)
                                break;
                }
                if(g && h && i)
                        return
        }
}

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Mar 8 20:29:47 2007