I'm just starting to work with Git. I would like to use TortoiseMerge as the difftool and mergetool. In my $HOME/.gitconfig I have the following sections. I've removed the user and color sections f...

What do the colors mean when resolving conflicts in TortoiseGit? E.g: There's a conflict in a file, and there's text highlighted with orange in the "theirs" window, and yellow in the "mine" window...

I use msysgit on my windows machine for Git. I have TortoiseGit installed mainly because I like TortoiseMerge and the log feature. Most of the time, when I use git mergetool to resolve merge confli...