GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge command

Browse source 
* Renamed command _merge into merge
This commit is contained in:
Johannes Schlatow 2010-08-07 17:50:02 +02:00
parent b8a3c1b565
commit 7294869d07
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/tests/merge.t
View file

@ -134,7 +134,7 @@ sleep(1);
qx{../task rc:remote.rc 4 +gym}; # right_newer
# merge remote into local
my $output_l = qx{../task rc:local.rc _merge remote/undo.data};
my $output_l = qx{../task rc:local.rc merge remote/undo.data};
#check output
like ($output_l, qr/Running redo/, "local-merge finished");
@ -142,7 +142,7 @@ unlike ($output_l, qr/Missing/, "local-merge: no missing entry");
unlike ($output_l, qr/Not adding duplicate/, "local-merge: no duplicates");
# merge local into remote
my $output_r = qx{../task rc:remote.rc _merge local/undo.data};
my $output_r = qx{../task rc:remote.rc merge local/undo.data};
# check output
like ($output_r, qr/Running redo/, "remote-merge finished");