Browse Source
Improve the translation of warning given by mergetool when staging files with conflict markers. Suggested-by: Alexey Shumkin <zapped@mail.ru> Tipping-vote-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>maint
Alex Riesen
14 years ago
committed by
Pat Thoyts
1 changed files with 1 additions and 1 deletions
Loading…
Reference in new issue