hi, the git documentation is so clear withcalling changes "mine" or "theirs". when configuring a mergetool e.g. kdiff3, and doing a rebase, these names are not used. instead it is "local", which is theirs in the rebase case, and remote, which is mine. not that this is rocket science, and i understand the technical reason why the names are like this. but anyway i get a nod in my brain about it sometimes. can i somehow configure git so it would use "mine" and "theirs" only? rupert
