| commit | 46ec0ec6ef8d77a1c5ae5344ffa17536227dfd5b | |
| author | Kevin Sawicki <kevin@github.com> | |
| Wed, 7 Dec 2011 23:11:53 +0000 (7 15:11 -0800) | ||
| committer | Kevin Sawicki <kevin@github.com> | |
| Wed, 14 Dec 2011 17:29:50 +0000 (14 09:29 -0800) | ||
| tree | 1dd73a0fc06758f86a6da9df3443a80a7c4f1dfb | treesnapshot (tar.gz zip) |
| parent | d661f5ad24eb7f6a8edb1fdfc7c74300e0825912 | commitdiff |
Don't show files message if no failing paths
Previously a line of "The following files..." would
be shown even if the merge result had null or empty
failing paths.
This now handles the case in the message when no paths
are present and also allows RevertFailureDialog to be
created with only a map of paths to reasons.
Bug: 365916
Change-Id: Idd975f7c2316e1610042077acc77dd79a1517076
Previously a line of "The following files..." would
be shown even if the merge result had null or empty
failing paths.
This now handles the case in the message when no paths
are present and also allows RevertFailureDialog to be
created with only a map of paths to reasons.
Bug: 365916
Change-Id: Idd975f7c2316e1610042077acc77dd79a1517076