I was going to get my old winsymlink branch caught up with trunk, so, using a build from the tip of trunk (This is fossil version 1.32 [a7e1101d71] 2015-03-17 21:10:44 UTC) I:
1. fossil update winsymlink 2. fossil merge trunk 3. merge conflict reported for src\file.c, src\update.c, & src\vfile.c. I view src\file.c where there is a single merge conflict. The first block (BEGIN MERGE CONFLICT: local copy shown first) shows exactly what I'd expect to see. The second and third blocks, however, are missing the last line from each. In this case the last line should be #endif for both the COMMON ANCESTER & MERGED IN blocks. Instead it is showing the all except for the final line. Just FYI. I can try to take a look at it later, but given the speed that these things are often fixed, I figured I'd report it now. -- Scott Robison
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
