diff options
Diffstat (limited to 'subversion/svn/conflict-callbacks.c')
| -rw-r--r-- | subversion/svn/conflict-callbacks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/subversion/svn/conflict-callbacks.c b/subversion/svn/conflict-callbacks.c index d5a98ddf6fbb7..3d41ecf936708 100644 --- a/subversion/svn/conflict-callbacks.c +++ b/subversion/svn/conflict-callbacks.c @@ -489,10 +489,10 @@ static const resolver_option_t text_conflict_options[] = /* Resolver options for a property conflict */ static const resolver_option_t prop_conflict_options[] = { - { "mf", N_("my version"), N_("accept my version of entire file (even " + { "mf", N_("my version"), N_("accept my version of entire property (even " "non-conflicts) [mine-full]"), svn_wc_conflict_choose_mine_full }, - { "tf", N_("their version"), N_("accept their version of entire file " + { "tf", N_("their version"), N_("accept their version of entire property " "(same) [theirs-full]"), svn_wc_conflict_choose_theirs_full }, { "dc", N_("display conflict"), N_("show conflicts in this property"), -1 }, |