diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2012-09-27 20:27:43 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2012-09-27 20:27:43 -0700 |
| commit | 3185fe4edea62dd3fa9818cf80902e96fe2a2d21 (patch) | |
| tree | 824a6cdb4b8ccc163127e00e1e86435b4c523476 /bin/23diff | |
| parent | f50a821d306b561d602edbdac0dac958b862ec0c (diff) | |
| parent | 39533c66139210655fc47404a17fd4e9b9ca8a00 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Conflicts:
FS/FS/cust_main/Billing.pm
Diffstat (limited to 'bin/23diff')
| -rwxr-xr-x | bin/23diff | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/23diff b/bin/23diff index 0c0575aa6..d38c84834 100755 --- a/bin/23diff +++ b/bin/23diff @@ -3,7 +3,8 @@ my $file = shift; chomp(my $dir = `pwd`); -$dir =~ s/freeside\//freeside2.3\//; +$dir =~ s/freeside(\/?)/freeside2.3$1/; +warn $dir; #$cmd = "diff -u $file $dir/$file"; $cmd = "diff -u $dir/$file $file"; |