FazBrowse GitHub Viewer
|
Trending
|
URL:
|
Home
Tools:
[Download Repo ZIP]
[View Raw Code]
[Original HTTPS Page]
git.github.io/mergetools/diffuse at master · USDOS/git.github.io · GitHub
Uh oh!
There was an error while loading.
Please reload this page
.
USDOS
/
git.github.io
Public
forked from
git/git
Notifications
You must be signed in to change notification settings
Fork
0
Star
0
Code
Issues
0
Pull requests
1
Discussions
Actions
Projects
Security and quality
0
Insights
Additional navigation options
Code
Issues
Pull requests
Discussions
Actions
Projects
Security and quality
Insights
Expand file tree
Breadcrumbs
git.github.io
/
mergetools
/
diffuse
Copy path
More file actions
More file actions
Latest commit
History
History
History
23 lines (20 loc) · 395 Bytes
Breadcrumbs
git.github.io
/
mergetools
/
diffuse
Copy path
File metadata and controls
23 lines (20 loc) · 395 Bytes
Raw
Copy raw file
Download raw file
Open symbols panel
Edit and raw actions
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}
diff_cmd_help () {
echo "Use Diffuse (requires a graphical session)"
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" \
"$LOCAL" "$MERGED" "$REMOTE" \
"$BASE" | cat
else
"$merge_tool_path" \
"$LOCAL" "$MERGED" "$REMOTE" | cat
fi
}
merge_cmd_help () {
echo "Use Diffuse (requires a graphical session)"
}
Back
|
FazBrowse Home
|
New Git URL