development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'br/mergetools-guiffy'

Browse source 
"git mergetools" learned talking to guiffy.

* br/mergetools-guiffy:
  mergetools: add support for guiffy
This commit is contained in:
Junio C Hamano 2018-04-25 13:28:54 +09:00
commit da36be5f08
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
mergetools/guiffy Normal file
View file

@ -0,0 +1,18 @@
diff_cmd () {
"$merge_tool_path" "$LOCAL" "$REMOTE"
}
merge_cmd () {
if $base_present
then
"$merge_tool_path" -s "$LOCAL" \
"$REMOTE" "$BASE" "$MERGED"
else
"$merge_tool_path" -m "$LOCAL" \
"$REMOTE" "$MERGED"
fi
}
exit_code_trustable () {
true
}