Define a basic merge API, and a two-way tree merge strategy
[egit/charleso.git] / .gitattributes
blobf57840b7eec86b91b135afc40f20d950c5d86988
1 *.java diff=java