summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-03-04 15:02:28 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-04 15:02:28 -0800
commit6d74e5c9dbe71e2eb63c6e8862ec979e9a5f068b (patch)
tree38fec0463961cdf87bdd64510efee61f3dff9ebb /git-mergetool--lib.sh
parentMerge branch 'mg/maint-difftool-vim-readonly' (diff)
parentgit-p4 submit: prevent 'Jobs' section from being removed from p4 change log (diff)
downloadtgif-6d74e5c9dbe71e2eb63c6e8862ec979e9a5f068b.tar.xz
Merge branch 'mh/p4'
* mh/p4: git-p4 submit: prevent 'Jobs' section from being removed from p4 change log
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions