[ui] username = Arun Chandrasekaran editor = vim merge = meld [auth] abc.prefix = abc.username = firstname.lastname@example.org abc.password = abcd abc.schemes = http https [merge-tools] meld.args = $local $other $base meld.priority = 1 [diff] ignorews = true ignorewsamount = true ignoreblanklines = true [alias] latest = log --limit 5 [extensions] extdiff = graphlog = color = fetch = churn = [extdiff] cmd.meld = cmd.vimdiff = [alias] vi = gvimdiff vim = gvimdiff
When obtaining the diff (do) or putting the diff (dp) vim will throw this error:
"E101: more than two buffers in diff mode, don't know which one to use".
In such cases, use
:diffget 2to get from the 2nd buffer and so on.