I met a problem when using meld.
I followed this link to setup meld on mac: https://yousseb.github.io/meld/
I installed meld with Mojave and added below lines in .gitconfig:
tool = meld
[difftool]
prompt = false
[difftool "meld"]
trustExitCode = true
cmd = open -W -a Meld --args \"$LOCAL\" \"$REMOTE\"
[merge]
tool = meld
[mergetool]
prompt = false
[mergetool "meld"]
trustExitCode = true
cmd = open -W -a Meld --args --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output=\"$MERGED\"
However, it doesn't work for me. It shows below info when I run "git difftool":
diff --cc SampleApp/src/CMakeLists.txt
index 13ed9c4,d7df22e..0000000
--- a/SampleApp/src/CMakeLists.txt
+++ b/SampleApp/src/CMakeLists.txt
@@@ -35,11 -34,11 +35,17 @@@ ENDIF(
add_executable(SampleApp ${SampleApp_SOURCES})
target_include_directories(SampleApp PUBLIC
- "${A_INCLUDE_DIRS}"
+ "${BInterface_SOURCE_DIR}/include"
"${a_SOURCE_DIR}/include"
++<<<<<<< HEAD
+ "${B_SOURCE_DIR}/include"
+ "${ww_SOURCE_DIR}/include"
+ "${xyz_INCLUDE_DIR}")
++=======
+ "${z_INCLUDE_DIR}"
+ "${Dependencies_Headers}"
+ "${b_INCLUDE_DIRS}")
++>>>>>>> 73d8100... add and modify files
target_link_libraries(TestApp
"${b_LDFLAGS}"
error: diff died of signal 11
Then I search solution online but still doesn't work for me. This link: https://github.com/yousseb/meld/issues/70
cd ${HOME}
rm -rf ./.local/share/meld
rm -f ./Library/Preferences/org.gnome.meld.plist
rm -rf "./Library/Saved Application State/org.gnome.meld.savedState/"
Aucun commentaire:
Enregistrer un commentaire