facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-12-27 23:22:02 +03:00
Code Issues Projects Releases Wiki Activity

testing: fix spacing for merge conflict markers

Browse Source 
Summary: Yay for arbitrary single space changes.

Test Plan: Run the two affected tests to show they now pass again.

Reviewers: simonfar, rmcelroy, quark, stash

Reviewed By: stash

Subscribers: mjpieters, #mercurial

Differential Revision: https://phabricator.intern.facebook.com/D4244213

Signature: t1:4244213:1480431919:ba4837619652023005faeb00a93a351c7ca0411a
This commit is contained in:
Martijn Pieters 2016-11-29 07:23:32 -08:00
parent 38e3389cbb
commit b302fcecbc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test-sparse.t
View File

@ -159,7 +159,7 @@ Verify rebase temporarily includes excluded files
hide
$ cat hide
<<<<<<< dest: 39278f7c08a9 - test: two
<<<<<<< dest: 39278f7c08a9 - test: two
y
=======
z

6
tests/test-sqldirstate-shelve.t
View File

@ -333,7 +333,7 @@ ensure that we have a merge with unresolved conflicts
+++ b/a/a
@@ -1,2 +1,6 @@
a
+<<<<<<< dest: * - shelve: pending changes temporary commit (glob)
+<<<<<<< dest: * - shelve: pending changes temporary commit (glob)
c
+=======
+a
@ -760,7 +760,7 @@ unshelve and conflicts with tracked and untracked files
M f
? f.orig
$ cat f
<<<<<<< dest: 5f6b880e719b - shelve: pending changes temporary commit
<<<<<<< dest: 5f6b880e719b - shelve: pending changes temporary commit
g
=======
f
@ -805,7 +805,7 @@ unshelve and conflicts with tracked and untracked files
M f
? f.orig
$ cat f
<<<<<<< dest: * - test: intermediate other change (glob)
<<<<<<< dest: * - test: intermediate other change (glob)
g
=======
f