##// END OF EJS Templates
settings: Use the new 'use_rebase' argument to decide between rebase or merge.
settings: Use the new 'use_rebase' argument to decide between rebase or merge.

File last commit:

r1:854a839a default
r362:c14bb309 default
Show More
hg_diff_copy_and_modify_file.diff
9 lines | 118 B | text/x-diff | DiffLexer
/ rhodecode / tests / fixtures / hg_diff_copy_and_modify_file.diff
diff --git a/file2 b/file3
copy from file2
copy to file3
--- a/file2
+++ b/file3
@@ -1,2 +1,3 @@
line1
line2
+line3