mergetools / kompareon commit Merge branch 'js/msgfmt-on-windows' of ../git-gui into js/git-gui-msgfmt-on-windows (90dbf22)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}
   8
   9exit_code_trustable () {
  10        true
  11}