summaryrefslogtreecommitdiff
path: root/mergetools/opendiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-21 10:49:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-21 10:49:25 -0700
commit689b047072030db30d101d43dbef6afd3b703c09 (patch)
tree82deb0182c3a35f35bca7c6680ad21aaccca556e /mergetools/opendiff
parentMerge branch 'js/maint-merge-one-file-osx-expr' into maint (diff)
parentSupport ERR in remote archive like in fetch/push (diff)
downloadtgif-689b047072030db30d101d43dbef6afd3b703c09.tar.xz
Merge branch 'il/archive-err-signal' into maint
* il/archive-err-signal: Support ERR in remote archive like in fetch/push
Diffstat (limited to 'mergetools/opendiff')
0 files changed, 0 insertions, 0 deletions