Hello! I am just wondering about a difference I see in conflicted files and what is described in the documentation <https://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-conflicts.html>.
In their it shows the example: > <<<<<<< filename > your changes > ======= > code merged from repository > >>>>>>> revision > > However in my file it looks a bit different: > <<<<<<< .mine > //Last modified: Wed, May 20, 2020 12:57:47 PM > ||||||| .r6046 > //Last modified: Thu, Mar 19, 2020 11:55:12 AM > ======= > //Last modified: Thu, May 07, 2020 04:52:08 PM > >>>>>>> .r6255 > So I am just curious what the three different sections mean, thanks! -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to tortoisesvn+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/c8dbef38-7605-48a9-b85d-20ac83e29e0d%40googlegroups.com.
