##// END OF EJS Templates
chore: fixed merge conflicts
chore: fixed merge conflicts

File last commit:

r1:854a839a default
r5546:50cf7822 merge v5.2.0 stable
Show More
hg_diff_copy_file.diff
3 lines | 57 B | text/x-diff | DiffLexer
diff --git a/file1 b/file2
copy from file1
copy to file2