Christian Stimming <stimming@xxxxxxx> wrote: > Am Freitag, 12. September 2008 12:23 schrieb Alexander Gavrilov: > > On Fri, Sep 12, 2008 at 1:17 PM, Christian Stimming <stimming@xxxxxxx> > wrote: > > >- set op_question [mc "Force resolution to %s? > > >-Note that the diff shows only conflicting changes. > > >+ set op_question [strcat $targetquestion "\n" \ > > >+[mc "Note that the diff shows only conflicting changes. > > > > ... > > > > > - $target [short_path $current_diff_path]] > > > + $targetquestion [short_path $current_diff_path]]] > > > > You should remove this $target completely -- there is no %s to match it > > anymore. > > Oh - right. Thanks for pointing this out. Please modify the patch accordingly. Fixed and applied. Thanks, both. -- Shawn. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
