bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] git-merge-changelog: fix missing space after conflict markers


From: Andreas Schwab
Subject: [PATCH] git-merge-changelog: fix missing space after conflict markers
Date: Sun, 09 Jan 2011 10:47:10 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2.91 (gnu/linux)

As required by git.

Andreas.

2011-01-09  Andreas Schwab  <address@hidden>

        * lib/git-merge-changelog.c (conflict_write): Add space after
        conflict marker.
---
 lib/git-merge-changelog.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/git-merge-changelog.c b/lib/git-merge-changelog.c
index 652b40a..fb846d3 100644
--- a/lib/git-merge-changelog.c
+++ b/lib/git-merge-changelog.c
@@ -940,13 +940,13 @@ conflict_write (FILE *fp, struct conflict *c)
   /* Use the same syntax as git's default merge driver.
      Don't indent the contents of the entries (with things like ">" or "-"),
      otherwise the user needs more textual editing to resolve the conflict.  */
-  fputs ("<<<<<<<\n", fp);
+  fputs ("<<<<<<< \n", fp);
   for (i = 0; i < c->num_old_entries; i++)
     entry_write (fp, c->old_entries[i]);
   fputs ("=======\n", fp);
   for (i = 0; i < c->num_modified_entries; i++)
     entry_write (fp, c->modified_entries[i]);
-  fputs (">>>>>>>\n", fp);
+  fputs (">>>>>>> \n", fp);
 }
 
 /* Long options.  */
-- 
1.7.3.5

-- 
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]