[alias] l5 = log -l 5 [extensions] color = fetch = graphlog = pager = record = transplant = [pager] pager = less -FSX attend = annotate, cat, diff, export, glog, help, log, l5, qdiff, showconfig ignore = clone, push, recommit, shelve, unshelve, update, version [ui] merge = vimdiff #[merge-tools] #vimdiff3.executable = vim # Don't forget to add -f for gvim # 3 way diffs #vimdiff3.args = -d "$output" "$local" "$base" "$other" -c "wincmd J"