diff options
Diffstat (limited to 'IkiWiki/Rcs/tla.pm')
| -rw-r--r-- | IkiWiki/Rcs/tla.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm index 48dc78157..7ce635c64 100644 --- a/IkiWiki/Rcs/tla.pm +++ b/IkiWiki/Rcs/tla.pm @@ -61,7 +61,7 @@ sub rcs_commit ($$$) { #{{{ "-L".possibly_foolish_untaint($message), '-d', $config{srcdir}) != 0) { my $conflict=readfile("$config{srcdir}/$file"); - if (system("tla", "undo", "--quiet", "-d", "$config{srcdir}") != 0) { + if (system("tla", "undo", "-n", "--quiet", "-d", "$config{srcdir}") != 0) { warn("tla undo failed\n"); } return $conflict; |