p147685/CardiacPhase
1
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity

Initial class construction

Browse Source
This commit is contained in:
João Narciso committed 2019-05-06 16:34:28 +02:00
1 parent 67f2d57e03
commit 431ff5f7d4
5813 files changed
+1622108
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Git/mingw64/libexec/git-core/mergetools/tkdiff
+16
View File
@@ -0,0 +1,16 @@
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
else
"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
fi
}
exit_code_trustable () {
true
}