summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool--lib.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-03-15 14:22:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-15 14:22:09 -0700
commit936dfc220210bc00c7dc094250c9680620dab291 (patch)
tree8b4f171464d082d6bb45c07baa2a4e25ec71dc42 /Documentation/git-mergetool--lib.txt
parentMerge branch 'jc/maint-apply-report-offset' (diff)
parentgit-cvsimport.perl: Bail out right away when reading from the server fails (diff)
downloadtgif-936dfc220210bc00c7dc094250c9680620dab291.tar.xz
Merge branch 'fk/maint-cvsimport-early-failure'
* fk/maint-cvsimport-early-failure: git-cvsimport.perl: Bail out right away when reading from the server fails
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions