Skip to main content

Browse the archive

Revision 1ecef023a9b89056d7070662dd0541481b54a7dc authored by Jiang Xin on 05 March 2021, 05:47:07 UTC, committed by Jiang Xin on 05 March 2021, 05:47:07 UTC 
Merge branch 'fr_next' of github.com:jnavila/git
 
* 'fr_next' of github.com:jnavila/git:
  l10n: fr: v2.31 rnd 2
2 parent s 5b888ad + 068cb92
Raw File
opendiff 
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-ancestor "$BASE" -merge "$MERGED" | cat
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-merge "$MERGED" | cat
	fi
}
back to top