#!/bin/bash
# 'conflict' style diff format

file1=$1
file2=$2
shift 2

exec diff --changed-group-format="<<<<<<< $file1
%<=======
%>>>>>>>> $file2
" "$file1" "$file2" "$@"