gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge

Browse Source 
- Applied patch to correct autopush after merge, thanks to Johannes.
This commit is contained in:
Paul Beckingham
2011-09-13 18:07:56 -04:00
parent 295e23aac4
commit 761def8fb7
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/merge.duplicates.t
View File

@@ -143,11 +143,11 @@ unlike ($output, qr/Missing/, "no missing entry");
$output = qx{../src/task rc:3.rc merge};
like ($output, qr/Merge complete/, "res3: post-merge completed");
unlike ($output, qr/Missing/, "no missing entry");
like ($output, qr/Retain/, "retained changes");
like ($output, qr/Retain/, "retained changes"); # 16
# pre-merge 1st
$output = qx{../src/task rc:1.rc merge};
like ($output, qr/Merge complete/, "res1: pre-merge completed");
like ($output, qr/Merge complete/, "res1: pre-merge completed"); # 17
unlike ($output, qr/Missing/, "no missing entry");
qx{../src/task rc:1.rc add Task5};