Andrew's git / gitweb.git / mergetools/p4merge
?
mergetools / p4mergeon commit Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui (8ead1bf)
   1diff_cmd () {
   2        "$merge_tool_path" "$LOCAL" "$REMOTE"
   3}
   4
   5merge_cmd () {
   6        touch "$BACKUP"
   7        $base_present || >"$BASE"
   8        "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
   9        check_unchanged
  10}