073291c476b4edb4d10bbada1e64b471ba153b6b
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>
Description
No description provided
Languages
C
50.1%
Shell
38.4%
Perl
5.1%
Tcl
3.3%
Python
0.8%
Other
2%