Author: julianfoad
Date: Mon Dec 3 18:12:30 2012
New Revision: 1416606
URL: http://svn.apache.org/viewvc?rev=1416606&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(obstructed_add_options): Add the end-of-list marker. A follow-up to
r1416578.
Found by: Bert
Modified:
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1416606&r1=1416605&r2=1416606&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Mon Dec 3 18:12:30
2012
@@ -332,6 +332,7 @@ static const resolver_option_t obstructe
{ "mf", "mine-full", N_("accept pre-existing item (ignore upstream
addition)") },
{ "tf", "theirs-full", N_("accept incoming item (overwrite pre-existing
item)") },
{ "h", "help", N_("show this help") },
+ { NULL }
};
/* Resolver options for a tree conflict */
