Robert Collins wrote:
| Public bug reported:
|
| A conflict on the last line of a file with no newlines are formatted
badly:
| --
| Foo\n
| bar
| --
|
| conflicting with
| --
| Foo\n
| bar\n
| --
| gave
| --
| Foo\n
| <<<<<<\n
| bar======\n
| bar\n
|>>>>>> \n
| --
|
| Not sure if we can do anything about this, but it seems desirable to
| have the === always against the left...
I should mention that we have 'bzr diff' do:
=== modified file 'foo'
- --- foo 2008-07-16 15:01:36 +0000
+++ foo 2008-07-16 15:01:48 +0000
@@ -1,2 +1,2 @@
~ foo
- -bar
\ No newline at end of file
+bar
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Robert Collins wrote:
| Public bug reported:
|
| A conflict on the last line of a file with no newlines are formatted
badly:
| --
| Foo\n
| bar
| --
|
| conflicting with
| --
| Foo\n
| bar\n
| --
| gave
| --
| Foo\n
| <<<<<<\n
| bar======\n
| bar\n
|>>>>>> \n
| --
|
| Not sure if we can do anything about this, but it seems desirable to
| have the === always against the left...
I should mention that we have 'bzr diff' do:
=== modified file 'foo'
- --- foo 2008-07-16 15:01:36 +0000
+++ foo 2008-07-16 15:01:48 +0000
@@ -1,2 +1,2 @@
~ foo
- -bar
\ No newline at end of file
+bar
John
=:->
-----BEGIN PGP SIGNATURE----- enigmail. mozdev. org
+DYsACgkQJdeBCY SNAAPY3ACfRAwBB IFX9ZbBpSvS2NWy 8EEo n3wHpnYtH1GTuKe uCoItm
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAkh
GeIAn2DX7h/
=InuI
-----END PGP SIGNATURE-----