On Sun, Jul 26, 2020 at 4:36 PM Brian Theado <brian.the...@gmail.com> wrote:
> The git log command I shared shows the diffs for leoSettings in your keys > branch. That didn't help you? > > $ git log -p cc568d628 leo/config/leoSettings.leo > > Wow. Great job of sleuthing. Finding this commit was what stumped me. I just learned something new about gitk. If I enter "cc568d628" into the SHA1 ID box, the title changes to "Goto". Clicking "Goto" takes me to the commit. This also partially answers the question of how you found it. The checkin log is "Merge branch 'devel' into keys". And now ` git log -p cc568d628 leo/config/leoSettings.leo` shows what the conflict was. And thanks for the rest of your post. I'll study it. Edward -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to leo-editor+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/leo-editor/CAMF8tS07Qk3us-65fHbNCU%2BKfGqXt%2BBjHYaE2JxC10Mz8Xvtag%40mail.gmail.com.
