diff options
Diffstat (limited to 'cervisia/tests/resolvedlg-BR74903-test-01.txt')
| -rw-r--r-- | cervisia/tests/resolvedlg-BR74903-test-01.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cervisia/tests/resolvedlg-BR74903-test-01.txt b/cervisia/tests/resolvedlg-BR74903-test-01.txt new file mode 100644 index 00000000..c4b8a22f --- /dev/null +++ b/cervisia/tests/resolvedlg-BR74903-test-01.txt @@ -0,0 +1,4 @@ +123 +<<<<<<< resolvedlg-BR74903-test-01.txt +conf======= +456>>>>>>> 1.2 |