##// END OF EJS Templates
merge: Resolved conflicts
merge: Resolved conflicts

File last commit:

r1:854a839a default
r5471:df8a724f merge v5.1.0 stable
Show More
hg_diff_rename_file.diff
3 lines | 73 B | text/x-diff | DiffLexer
diff --git a/file b/file_renamed
rename from file
rename to file_renamed