blob 566a0d9d635562614ba72698c0b34780c0dfce0b 124 bytes (raw)
name: mergetools/code # note: path name is non-authoritative(*)
1
2
3
4
5
6
7
| | diff_cmd () {
"$merge_tool_path" --wait --diff "$LOCAL" "$REMOTE"
}
merge_cmd () {
"$merge_tool_path" --wait "$MERGED"
}
|
debug log:
solving 566a0d9d63 ...
found 566a0d9d63 in https://public-inbox.org/git/20190604232134.14748-1-wenbei123@gmail.com/
applying [1/1] https://public-inbox.org/git/20190604232134.14748-1-wenbei123@gmail.com/
diff --git a/mergetools/code b/mergetools/code
new file mode 100644
index 0000000000..566a0d9d63
Checking patch mergetools/code...
Applied patch mergetools/code cleanly.
index at:
100644 566a0d9d635562614ba72698c0b34780c0dfce0b mergetools/code
(*) Git path names are given by the tree(s) the blob belongs to.
Blobs themselves have no identifier aside from the hash of its contents.^
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).