repo.or.cz
/
git
/
jrn.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
refresh_index: do not show unmerged path that is outside pathspec
[git/jrn.git]
/
mergetools
/
diffuse
blob
02e0843f47e09a7cc6cdd2a9c70e36773ecc96af
1
diff_cmd () {
2
"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
3
}
4
5
merge_cmd () {
6
touch "$BACKUP"
7
if $base_present
8
then
9
"$merge_tool_path" \
10
"$LOCAL" "$MERGED" "$REMOTE" \
11
"$BASE" | cat
12
else
13
"$merge_tool_path" \
14
"$LOCAL" "$MERGED" "$REMOTE" | cat
15
fi
16
check_unchanged
17
}