Skip to content

Commit 41f597f

Browse files
committed
Split line
1 parent 2477b6f commit 41f597f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

git-resolve-conflict-using-kdiff3.pl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ sub find_unmerged_files {
7575
my %tmp;
7676
open(PIPE, "git ls-files --unmerged " . shell_quote($toplevel_dir) . " -z |");
7777
if (not eof(PIPE)) {
78-
foreach my $line (split(/\0/, <PIPE>)) {
78+
my @lines = split /\0/, <PIPE>;
79+
foreach my $line (@lines) {
7980
chomp($line);
8081
my ($prefix, $file) = split(/\t/, $line);
8182
my (undef, $sha, $number) = split(/ /, $prefix);

0 commit comments

Comments
 (0)