diff options
author | Junio C Hamano <junkio@cox.net> | 2007-03-14 01:38:57 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-03-14 01:38:57 -0700 |
commit | c746e44fb8e7cf738177fee8d861defd4203af55 (patch) | |
tree | cd1629fe1dbe44d0006b7b2238f5f058859edf45 /Documentation/git-mergetool.txt | |
parent | Merge branch 'maint' (diff) | |
parent | add: Support specifying an excludes file with a configuration variable (diff) | |
download | tgif-c746e44fb8e7cf738177fee8d861defd4203af55.tar.xz |
Merge branch 'jb/per-user-exclude'
* jb/per-user-exclude:
add: Support specifying an excludes file with a configuration variable
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions