Linux using Beyon compare4 as Git diff tool

下載及安ufye Beyon Compare 4

     http://www.scootersoftware.com/download.php?zz=kb_linux_install


=========================================

.gitconfig


[user]
    name =your_name
    email = your_email
[color]
    ui = true
[core]
    editor = vim
;[merge]
    ;tool = bc
[diff]
    external = /root/.git-diff-wrapper.sh
[merge]
    tool = bc
[mergetool "bc"]
    cmd = bcompare \
    "$PWD/$LOCAL" \
    "$PWD/$REMOTE" \
    "$PWD/$BASE" \
    "$PWD/$MERGED"
    keepBackup = false
    trustExitCode = false


===========================================

content  of file   /root/.git-diff-wrapper.sh is



#!/bin/sh
# diff is called by git with 7 parameters:
# path old-file old-hex old-mode new-file new-hex new-mode
/usr/bin/bcompare "$2" "$5" | cat

================================================


  • 0
    点赞
  • 0
    收藏
    觉得还不错? 一键收藏
  • 0
    评论

“相关推荐”对你有帮助么?

  • 非常没帮助
  • 没帮助
  • 一般
  • 有帮助
  • 非常有帮助
提交
评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值