Merging files in Sublime with Sublimerge via command line

前端 未结 4 993
栀梦
栀梦 2021-01-02 00:08

I\'m trying to find a better merge file option and wanted to try out Sublime as of my work is done using it. so I installed Sublimerge and now am stuck. I know I can compare

4条回答
  •  天涯浪人
    2021-01-02 00:46

    As Nickolay already suggested, this is the whole directive you have to put in your ~/.gitconfig:

    [merge]
        tool = sublimerge
    
    [mergetool "sublimerge"]
        cmd = subl -n --wait \"$REMOTE\" \"$BASE\" \"$LOCAL\" \"$MERGED\" --command \"sublimerge_diff_views\"
        trustExitCode = false
    
    [diff]
        tool = sublimerge
    
    [difftool "sublimerge"]
        cmd = subl -n --wait \"$REMOTE\" \"$LOCAL\" --command \"sublimerge_diff_views {\\\"left_read_only\\\": true, \\\"right_read_only\\\": true}\"
    

提交回复
热议问题